summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-07-15 15:48:44 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2015-07-15 15:48:44 -0400
commit39524cdb766660a7bf6d60379040349652cecc04 (patch)
treee0657f37fbd8cbd7bf724025a4bb19e68e1e0254 /engine
parent67e56102ef56e91e9563a32f6fc68827219d2037 (diff)
More enumeration of constants, more annotations of scripts.
Diffstat (limited to 'engine')
-rw-r--r--engine/buena_phone_scripts.asm44
-rw-r--r--engine/color.asm11
-rw-r--r--engine/events.asm235
-rw-r--r--engine/events_2.asm4
-rw-r--r--engine/map_objects.asm1071
-rw-r--r--engine/map_setup.asm2
-rw-r--r--engine/pack.asm26
-rw-r--r--engine/phone_scripts.asm24
-rw-r--r--engine/scripting.asm342
-rw-r--r--engine/spawn_points.asm35
-rw-r--r--engine/specials.asm25
-rw-r--r--engine/std_scripts.asm592
12 files changed, 1200 insertions, 1211 deletions
diff --git a/engine/buena_phone_scripts.asm b/engine/buena_phone_scripts.asm
index 4d0c79b61..0a278ca03 100644
--- a/engine/buena_phone_scripts.asm
+++ b/engine/buena_phone_scripts.asm
@@ -2,7 +2,7 @@ UnknownScript_0xa0b14:
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0xa0b73
checkcode VAR_HOUR
- if_greater_than $11, UnknownScript_0xa0b4b
+ if_greater_than 17, UnknownScript_0xa0b4b
scall UnknownScript_0xa0b32
jump UnknownScript_0xa0c0e
@@ -37,7 +37,7 @@ UnknownScript_0xa0b4b:
UnknownScript_0xa0b4f:
checkcode VAR_HOUR
- if_greater_than $11, UnknownScript_0xa0b6e
+ if_greater_than 17, UnknownScript_0xa0b6e
checkmorn
iftrue UnknownScript_0xa0b64
checkday
@@ -68,27 +68,27 @@ UnknownScript_0xa0b73:
UnknownScript_0xa0b77:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0xa0b82
- random $b
+ random 11
jump UnknownScript_0xa0b84
UnknownScript_0xa0b82:
- random $e
+ random 14
UnknownScript_0xa0b84:
- if_equal $0, UnknownScript_0xa0bbc
- if_equal $1, UnknownScript_0xa0bc2
- if_equal $2, UnknownScript_0xa0bc8
- if_equal $3, UnknownScript_0xa0bce
- if_equal $4, UnknownScript_0xa0bd4
- if_equal $5, UnknownScript_0xa0bda
- if_equal $6, UnknownScript_0xa0be0
- if_equal $7, UnknownScript_0xa0be6
- if_equal $8, UnknownScript_0xa0bec
- if_equal $9, UnknownScript_0xa0bf2
- if_equal $a, UnknownScript_0xa0bf8
- if_equal $b, UnknownScript_0xa0bfe
- if_equal $c, UnknownScript_0xa0c04
- if_equal $d, UnknownScript_0xa0c0a
+ if_equal 0, UnknownScript_0xa0bbc
+ if_equal 1, UnknownScript_0xa0bc2
+ if_equal 2, UnknownScript_0xa0bc8
+ if_equal 3, UnknownScript_0xa0bce
+ if_equal 4, UnknownScript_0xa0bd4
+ if_equal 5, UnknownScript_0xa0bda
+ if_equal 6, UnknownScript_0xa0be0
+ if_equal 7, UnknownScript_0xa0be6
+ if_equal 8, UnknownScript_0xa0bec
+ if_equal 9, UnknownScript_0xa0bf2
+ if_equal 10, UnknownScript_0xa0bf8
+ if_equal 11, UnknownScript_0xa0bfe
+ if_equal 12, UnknownScript_0xa0c04
+ if_equal 13, UnknownScript_0xa0c0a
UnknownScript_0xa0bbc:
writetext UnknownText_0xa0efb
@@ -149,10 +149,10 @@ UnknownScript_0xa0c0d:
end
UnknownScript_0xa0c0e:
- random $3
- if_equal $0, UnknownScript_0xa0c1c
- if_equal $1, UnknownScript_0xa0c20
- if_equal $2, UnknownScript_0xa0c24
+ random 3
+ if_equal 0, UnknownScript_0xa0c1c
+ if_equal 1, UnknownScript_0xa0c20
+ if_equal 2, UnknownScript_0xa0c24
UnknownScript_0xa0c1c:
writetext UnknownText_0xa1c88
diff --git a/engine/color.asm b/engine/color.asm
index 314bf2981..e922b8849 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -806,8 +806,7 @@ Function9764: ; 9764
Function976b: ; 976b
ld l, a
ld h, 0
- add hl, hl
- add hl, hl
+ add_n_times hl, hl, 2
ld bc, TrainerPalettes
add hl, bc
ret
@@ -1975,9 +1974,7 @@ Functionb1de: ; b1de
push hl
ld l, a
ld h, 0
- add hl, hl
- add hl, hl
- add hl, hl
+ add_n_times hl, hl, 3
ld de, TilesetBGPalette
add hl, de
ld e, l
@@ -2017,9 +2014,7 @@ Functionb1de: ; b1de
ld a, [MapGroup]
ld l, a
ld h, 0
- add hl, hl
- add hl, hl
- add hl, hl
+ add_n_times hl, hl, 3
ld de, RoofPals
add hl, de
ld a, [TimeOfDayPal]
diff --git a/engine/events.asm b/engine/events.asm
index cf2d4f3e4..b37f53d39 100644
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -24,91 +24,91 @@ OverworldLoop:: ; 966b0
; 966cb
-Function966cb: ; 966cb
+ClearAllScriptFlags3: ; 966cb
xor a
ld [ScriptFlags3], a
ret
; 966d0
-Function966d0:: ; 966d0
+SetAll_ScriptFlags3:: ; 966d0
ld a, $ff
ld [ScriptFlags3], a
ret
; 966d6
-Function966d6: ; 966d6
+CheckBit5_ScriptFlags3: ; 966d6
ld hl, ScriptFlags3
bit 5, [hl]
ret
; 966dc
-Function966dc: ; 966dc
+ResetBit2_ScriptFlags3: ; 966dc
ld hl, ScriptFlags3
res 2, [hl]
ret
; 966e2
-Function966e2: ; 966e2
+ResetBit1_ScriptFlags3: ; 966e2
ld hl, ScriptFlags3
res 1, [hl]
ret
; 966e8
-Function966e8: ; 966e8
+ResetBit0_ScriptFlags3: ; 966e8
ld hl, ScriptFlags3
res 0, [hl]
ret
; 966ee
-Function966ee: ; 966ee
+ResetBit4_ScriptFlags3: ; 966ee
ld hl, ScriptFlags3
res 4, [hl]
ret
; 966f4
-Function966f4: ; 966f4
+SetBit2_ScriptFlags3: ; 966f4
ld hl, ScriptFlags3
set 2, [hl]
ret
; 966fa
-Function966fa: ; 966fa
+SetBit1_ScriptFlags3: ; 966fa
ld hl, ScriptFlags3
set 1, [hl]
ret
; 96700
-Function96700: ; 96700
+SetBit0_ScriptFlags3: ; 96700
ld hl, ScriptFlags3
set 0, [hl]
ret
; 96706
-Function96706: ; 96706
+SetBit4_ScriptFlags3: ; 96706
ld hl, ScriptFlags3
set 4, [hl]
ret
; 9670c
-Function9670c: ; 9670c
+CheckBit2_ScriptFlags3: ; 9670c
ld hl, ScriptFlags3
bit 2, [hl]
ret
; 96712
-Function96712: ; 96712
+CheckBit1_ScriptFlags3: ; 96712
ld hl, ScriptFlags3
bit 1, [hl]
ret
; 96718
-Function96718: ; 96718
+CheckBit0_ScriptFlags3: ; 96718
ld hl, ScriptFlags3
bit 0, [hl]
ret
; 9671e
-Function9671e: ; 9671e
+CheckBit4_ScriptFlags3: ; 9671e
ld hl, ScriptFlags3
bit 4, [hl]
ret
@@ -135,20 +135,20 @@ EnterMap: ; 9673e
ld [wd454], a
call Function968d1
callba RunMapSetupScript
- call Function966cb
+ call ClearAllScriptFlags3
ld a, [$ff9f]
cp $f7
- jr nz, .asm_9675a
- call Function966d0
-.asm_9675a
+ jr nz, .dontset
+ call SetAll_ScriptFlags3
+.dontset
ld a, [$ff9f]
cp $f3
- jr nz, .asm_96764
+ jr nz, .dontresetpoison
xor a
ld [PoisonStepCount], a
-.asm_96764
+.dontresetpoison
xor a
ld [$ff9f], a
@@ -197,7 +197,7 @@ MapEvents: ; 96795
.events ; 967a1
call PlayerEvents
- call Function966cb
+ call ClearAllScriptFlags3
callba ScriptEvents
ret
; 967ae
@@ -254,19 +254,19 @@ Function967e1: ; 967e1
Function967f4: ; 967f4
ld a, [wd150]
bit 5, a
- jr z, .asm_96806
+ jr z, .events
bit 6, a
- jr z, .asm_9680c
+ jr z, .noevents
bit 4, a
- jr nz, .asm_9680c
- call Function966d0
+ jr nz, .noevents
+ call SetAll_ScriptFlags3
-.asm_96806
+.events
ld a, 0 ; events
ld [MapEventStatus], a
ret
-.asm_9680c
+.noevents
ld a, 1 ; no events
ld [MapEventStatus], a
ret
@@ -293,44 +293,44 @@ PlayerEvents: ; 9681f
call Function968e4
call CheckTrainerBattle3
- jr c, .asm_96848
+ jr c, .ok
call CheckTileEvent
- jr c, .asm_96848
+ jr c, .ok
call Function97c30
- jr c, .asm_96848
+ jr c, .ok
call Function968ec
- jr c, .asm_96848
+ jr c, .ok
call Function9693a
- jr c, .asm_96848
+ jr c, .ok
call OWPlayerInput
- jr c, .asm_96848
+ jr c, .ok
xor a
ret
-.asm_96848
+.ok
push af
- callba Function96c56
+ callba EnableScriptMode
pop af
ld [ScriptRunning], a
call Function96beb
ld a, [ScriptRunning]
cp 4
- jr z, .asm_96865
+ jr z, .ok2
cp 9
- jr z, .asm_96865
+ jr z, .ok2
xor a
ld [wc2da], a
-.asm_96865
+.ok2
scf
ret
; 96867
@@ -340,13 +340,13 @@ CheckTrainerBattle3: ; 96867
nop
nop
call CheckTrainerBattle2
- jr nc, .asm_96872
+ jr nc, .nope
ld a, 1
scf
ret
-.asm_96872
+.nope
xor a
ret
; 96874
@@ -355,47 +355,47 @@ CheckTrainerBattle3: ; 96867
CheckTileEvent: ; 96874
; Check for warps, tile triggers or wild battles.
- call Function9670c
- jr z, .asm_96886
+ call CheckBit2_ScriptFlags3
+ jr z, .bit2
callba Function104820
- jr c, .asm_968a6
+ jr c, .return4
call Function2238
- jr c, .asm_968aa
+ jr c, .return6
-.asm_96886
- call Function96712
- jr z, .asm_96890
+.bit2
+ call CheckBit1_ScriptFlags3
+ jr z, .bit1
call Function2ad4
- jr c, .asm_968ba
+ jr c, .movement
-.asm_96890
- call Function96718
- jr z, .asm_96899
+.bit1
+ call CheckBit0_ScriptFlags3
+ jr z, .bit0
call CountStep
ret c
-.asm_96899
- call Function9671e
- jr z, .asm_968a4
+.bit0
+ call CheckBit4_ScriptFlags3
+ jr z, .ok
call Function97cc0
ret c
- jr .asm_968a4
+ jr .ok
-.asm_968a4
+.ok
xor a
ret
-.asm_968a6
+.return4
ld a, 4
scf
ret
-.asm_968aa
+.return6
ld a, [StandingTile]
call CheckPitTile
jr nz, .asm_968b6
@@ -408,7 +408,7 @@ CheckTileEvent: ; 96874
scf
ret
-.asm_968ba
+.movement
ld hl, MovementAnimation
ld a, [hli]
ld h, [hl]
@@ -450,7 +450,7 @@ Function968d8: ; 968d8
; 968e4
Function968e4: ; 968e4
- call Function966d6
+ call CheckBit5_ScriptFlags3
ret z
call Function2f3e
ret
@@ -459,12 +459,12 @@ Function968e4: ; 968e4
Function968ec: ; 968ec
ld a, [wdc07]
and a
- jr z, .asm_96938
+ jr z, .nope
ld c, a
- call Function211b
+ call CheckTriggers
cp c
- jr nc, .asm_96938
+ jr nc, .nope
ld e, a
ld d, 0
@@ -472,11 +472,8 @@ Function968ec: ; 968ec
ld a, [hli]
ld h, [hl]
ld l, a
- add hl, de
- add hl, de
- add hl, de
- add hl, de
-
+ add_n_times hl, de, 4
+
call GetMapScriptHeaderBank
call GetFarHalfword
call GetMapScriptHeaderBank
@@ -485,12 +482,12 @@ Function968ec: ; 968ec
ld hl, ScriptFlags
res 3, [hl]
- callba Function96c56
+ callba EnableScriptMode
callba ScriptEvents
ld hl, ScriptFlags
bit 3, [hl]
- jr z, .asm_96938
+ jr z, .nope
ld hl, ScriptDelay + 2
ld a, [hli]
@@ -501,7 +498,7 @@ Function968ec: ; 968ec
scf
ret
-.asm_96938
+.nope
xor a
ret
; 9693a
@@ -608,25 +605,25 @@ TryObjectEvent: ; 969b5
.IsObject
call PlayTalkObject
ld a, [hConnectedMapWidth]
- call Function1ae5
- ld hl, $0001
+ call GetObjectStruct
+ ld hl, OBJECT_MAP_OBJECT_INDEX
add hl, bc
ld a, [hl]
ld [$ffe0], a
ld a, [$ffe0]
call GetMapObject
- ld hl, $0008
+ ld hl, MAPOBJECT_COLOR
add hl, bc
ld a, [hl]
- and $f
+ and %00001111
; Bug: If IsInArray returns nc, data at bc will be executed as code.
push bc
ld de, 3
- ld hl, .data_969ee
+ ld hl, .pointers
call IsInArray
- jr nc, .asm_969ec
+ jr nc, .nope_bugged
pop bc
inc hl
@@ -635,11 +632,11 @@ TryObjectEvent: ; 969b5
ld l, a
jp [hl]
-.asm_969ec
+.nope_bugged
xor a
ret
-.data_969ee
+.pointers
dbw 0, .zero
dbw 1, .one
dbw 2, .two
@@ -647,11 +644,11 @@ TryObjectEvent: ; 969b5
dbw 4, .four
dbw 5, .five
dbw 6, .six
- db $ff
+ db -1
; 96a04
.zero ; 96a04
- ld hl, $000a
+ ld hl, MAPOBJECT_POINTER_LO
add hl, bc
ld a, [hli]
ld h, [hl]
@@ -663,7 +660,7 @@ TryObjectEvent: ; 969b5
; 96a12
.one ; 96a12
- ld hl, $000a
+ ld hl, MAPOBJECT_POINTER_LO
add hl, bc
ld a, [hli]
ld h, [hl]
@@ -712,7 +709,7 @@ TryReadSign: ; 96a38
ret
.IsSign
- ld a, [MartPointer]
+ ld a, [wd040]
ld hl, .signs
rst JumpTable
ret
@@ -726,7 +723,7 @@ TryReadSign: ; 96a38
dw .ifset
dw .ifnotset
dw .itemifset
- dw .asm_96aa2
+ dw .copy
; 96a59
.up
@@ -773,7 +770,7 @@ TryReadSign: ; 96a38
scf
ret
-.asm_96aa2
+.copy
call CheckSignFlag
jr nz, .dontread
call GetMapScriptHeaderBank
@@ -785,13 +782,13 @@ TryReadSign: ; 96a38
.ifset
call CheckSignFlag
jr z, .dontread
- jr .asm_96ac1
+ jr .thenread
.ifnotset
call CheckSignFlag
jr nz, .dontread
-.asm_96ac1
+.thenread
push hl
call PlayTalkObject
pop hl
@@ -878,8 +875,8 @@ PlayerMovement: ; 96af0
.three ; 96b20
; force the player to move in some direction
- ld a, BANK(UnknownScript_0x1253d)
- ld hl, UnknownScript_0x1253d
+ ld a, BANK(Script_ForcedMovement)
+ ld hl, Script_ForcedMovement
call CallScript
; ld a, -1
ld c, a
@@ -941,8 +938,8 @@ SelectMenuScript: ; 96b5f
StartMenuCallback:
SelectMenuCallback: ; 96b66
copybytetovar $ffa0
- if_equal $80, .Script
- if_equal $ff, .Asm
+ if_equal %10000000, .Script
+ if_equal -1, .Asm
end
; 96b72
@@ -959,13 +956,13 @@ SelectMenuCallback: ; 96b66
CountStep: ; 96b79
ld a, [InLinkBattle]
and a
- jr nz, .asm_96bc9
+ jr nz, .done
callba Function90136
- jr c, .asm_96bcb
+ jr c, .setminus1
call Function96bd7
- jr c, .asm_96bcb
+ jr c, .setminus1
ld hl, PoisonStepCount
inc [hl]
@@ -981,7 +978,7 @@ CountStep: ; 96b79
jr nz, .asm_96bab
callba Function16f3e
- jr nz, .asm_96bcf
+ jr nz, .set8
.asm_96bab
callba DaycareStep
@@ -989,25 +986,25 @@ CountStep: ; 96b79
ld hl, PoisonStepCount
ld a, [hl]
cp 4
- jr c, .asm_96bc3
+ jr c, .poisoned
ld [hl], 0
callba Function505da
- jr c, .asm_96bcb
+ jr c, .setminus1
-.asm_96bc3
+.poisoned
callba Function97db3
-.asm_96bc9
+.done
xor a
ret
-.asm_96bcb
+.setminus1
ld a, -1
scf
ret
-.asm_96bcf
+.set8
ld a, 8
scf
ret
@@ -1015,7 +1012,7 @@ CountStep: ; 96b79
Function96bd3: ; 96bd3
- ld a, $7
+ ld a, 7
scf
ret
; 96bd7
@@ -1038,17 +1035,15 @@ Function96beb: ; 96beb
ld a, [ScriptRunning]
and a
ret z
- cp $ff
+ cp -1
ret z
- cp $a
+ cp 10
ret nc
ld c, a
ld b, 0
ld hl, ScriptPointers96c0c
- add hl, bc
- add hl, bc
- add hl, bc
+ add_n_times hl, bc, 3
ld a, [hli]
ld [ScriptBank], a
ld a, [hli]
@@ -1059,20 +1054,20 @@ Function96beb: ; 96beb
; 96c0c
ScriptPointers96c0c: ; 96c0c
- dbw BANK(UnknownScript_0x96c2d), UnknownScript_0x96c2d
- dbw BANK(UnknownScript_0xbe675), UnknownScript_0xbe675
- dbw BANK(UnknownScript_0xbe66a), UnknownScript_0xbe66a
- dbw BANK(UnknownScript_0x122ce), UnknownScript_0x122ce
+ dbw BANK(Invalid_0x96c2d), Invalid_0x96c2d
+ dbw BANK(SeenByTrainerScript), SeenByTrainerScript
+ dbw BANK(TalkToTrainerScript), TalkToTrainerScript
+ dbw BANK(FindItemInBallScript), FindItemInBallScript
dbw BANK(UnknownScript_0x96c4d), UnknownScript_0x96c4d
- dbw BANK(UnknownScript_0x96c34), UnknownScript_0x96c34
+ dbw BANK(WarpToNewMapScript), WarpToNewMapScript
dbw BANK(FallIntoMapScript), FallIntoMapScript
dbw BANK(UnknownScript_0x124c8), UnknownScript_0x124c8
- dbw BANK(UnknownScript_0x96c2f), UnknownScript_0x96c2f
+ dbw BANK(HatchEggScript), HatchEggScript
dbw BANK(UnknownScript_0x96c4f), UnknownScript_0x96c4f
- dbw BANK(UnknownScript_0x96c2d), UnknownScript_0x96c2d
+ dbw BANK(Invalid_0x96c2d), Invalid_0x96c2d
; 96c2d
-UnknownScript_0x96c2d: ; 96c2d
+Invalid_0x96c2d: ; 96c2d
end
; 96c2e
@@ -1080,12 +1075,12 @@ UnknownScript_0x96c2e: ; 96c2e
end
; 96c2f
-UnknownScript_0x96c2f: ; 96c2f
- callasm Function16f5e
+HatchEggScript: ; 96c2f
+ callasm OverworldHatchEgg
end
; 96c34
-UnknownScript_0x96c34: ; 96c34
+WarpToNewMapScript: ; 96c34
warpsound
newloadmap $f5
end
@@ -1116,7 +1111,7 @@ UnknownScript_0x96c4d: ; 96c4d
UnknownScript_0x96c4f: ; 96c4f
deactivatefacing $3
- callasm Function96706
+ callasm SetBit4_ScriptFlags3
end
; 96c56
diff --git a/engine/events_2.asm b/engine/events_2.asm
index 433c7caea..506075c52 100644
--- a/engine/events_2.asm
+++ b/engine/events_2.asm
@@ -125,8 +125,8 @@ Function97cc0:: ; 97cc0
jr .asm_97cf4
.asm_97ced
- ld a, BANK(UnknownScript_0x135eb)
- ld hl, UnknownScript_0x135eb
+ ld a, BANK(BugCatchingContestBattleScript)
+ ld hl, BugCatchingContestBattleScript
jr .asm_97cf4
.asm_97cf4
diff --git a/engine/map_objects.asm b/engine/map_objects.asm
index d7c1b6581..c44d40df7 100644
--- a/engine/map_objects.asm
+++ b/engine/map_objects.asm
@@ -1,7 +1,7 @@
INCLUDE "engine/facings.asm"
-Data4273:: ; 4273
+ObjectStruct3_Data:: ; 4273
db $00, $00, $01, $02, $00, $00
db $06, $00, $01, $0c, $00, $00
db $03, $00, $01, $00, $00, $00
@@ -45,26 +45,26 @@ Data4273:: ; 4273
Function4357:: ; 4357
push bc
- ld hl, OBJECT_01
+ ld hl, OBJECT_MAP_OBJECT_INDEX
add hl, bc
ld a, [hl]
push af
ld h, b
ld l, c
- ld bc, ObjectStruct2 - ObjectStruct1
+ ld bc, OBJECT_STRUCT_LENGTH
xor a
call ByteFill
pop af
- cp $ff
- jr z, .asm_4379
+ cp -1
+ jr z, .ok
bit 7, a
- jr nz, .asm_4379
+ jr nz, .ok
call GetMapObject
- ld hl, OBJECT_00
+ ld hl, OBJECT_SPRITE
add hl, bc
- ld [hl], $ff
+ ld [hl], -1
-.asm_4379
+.ok
pop bc
ret
; 437b
@@ -86,24 +86,24 @@ Function4386: ; 4386
ld hl, OBJECT_MAP_X
add hl, bc
ld a, [hl]
- add $1
+ add 1
sub e
- jr c, .asm_43b2
- cp $c
- jr nc, .asm_43b2
+ jr c, .ok
+ cp MAPOBJECT_SCREEN_WIDTH
+ jr nc, .ok
ld a, [YCoord]
ld e, a
ld hl, OBJECT_MAP_Y
add hl, bc
ld a, [hl]
- add $1
+ add 1
sub e
- jr c, .asm_43b2
- cp $b
- jr nc, .asm_43b2
- jr .asm_43dc
+ jr c, .ok
+ cp MAPOBJECT_SCREEN_HEIGHT
+ jr nc, .ok
+ jr .yes
-.asm_43b2
+.ok
ld hl, OBJECT_FLAGS
add hl, bc
set 6, [hl]
@@ -112,36 +112,36 @@ Function4386: ; 4386
ld hl, OBJECT_20
add hl, bc
ld a, [hl]
- add $1
+ add 1
sub e
- jr c, .asm_43de
- cp $c
- jr nc, .asm_43de
+ jr c, .ok2
+ cp MAPOBJECT_SCREEN_WIDTH
+ jr nc, .ok2
ld a, [YCoord]
ld e, a
ld hl, OBJECT_21
add hl, bc
ld a, [hl]
- add $1
+ add 1
sub e
- jr c, .asm_43de
- cp $b
- jr nc, .asm_43de
+ jr c, .ok2
+ cp MAPOBJECT_SCREEN_HEIGHT
+ jr nc, .ok2
-.asm_43dc
+.yes
and a
ret
-.asm_43de
+.ok2
ld hl, OBJECT_04
add hl, bc
bit 1, [hl]
- jr nz, .asm_43eb
+ jr nz, .yes2
call Function4357
scf
ret
-.asm_43eb
+.yes2
ld hl, OBJECT_FLAGS
add hl, bc
set 6, [hl]
@@ -154,38 +154,38 @@ Function43f3: ; 43f3
add hl, bc
ld a, [hl]
and a
- jr z, .asm_4409
+ jr z, .zero
ld hl, OBJECT_FLAGS
add hl, bc
bit 5, [hl]
- jr nz, .asm_4426
- cp $1
- jr z, .asm_4414
- jr .asm_4421
+ jr nz, .not_bit5
+ cp 1
+ jr z, .one
+ jr .ok
-.asm_4409
+.zero
call Function47bc
ld hl, OBJECT_FLAGS
add hl, bc
bit 5, [hl]
- jr nz, .asm_4426
+ jr nz, .not_bit5
-.asm_4414
+.one
call Function47dd
ld hl, OBJECT_09
add hl, bc
ld a, [hl]
and a
ret z
- cp $1
+ cp 1
ret z
-.asm_4421
+.ok
ld hl, Pointers4b45
rst JumpTable
ret
-.asm_4426
+.not_bit5
ret
; 4427
@@ -226,8 +226,7 @@ Function444d: ; 444d
ld a, [hl]
ld l, a
ld h, 0
- add hl, hl
- add hl, hl
+ add_n_times hl, hl, 2
add hl, de
ld a, [hli]
ld h, [hl]
@@ -274,26 +273,26 @@ Pointers445f: ; 445f
; 44a3
Function44a3: ; 44a3
- ld hl, OBJECT_FACING
+ ld hl, OBJECT_FACING_STEP
add hl, bc
- ld [hl], $ff
+ ld [hl], -1
ret
; 44aa
Function44aa: ; 44aa
call GetSpriteDirection
- or $0
- ld hl, OBJECT_FACING
+ or 0
+ ld hl, OBJECT_FACING_STEP
add hl, bc
ld [hl], a
ret
; 44b5
Function44b5: ; 44b5
- ld hl, OBJECT_FACING
+ ld hl, OBJECT_FACING_STEP
add hl, bc
ld a, [hl]
- and $1
+ and 1
jr nz, Function44c1
jp Function44aa
; 44c1
@@ -307,16 +306,16 @@ Function44c1: ; 44c1
add hl, bc
ld a, [hl]
inc a
- and $f
+ and %00001111
ld [hl], a
rrca
rrca
- and $3
+ and %00000011
ld d, a
call GetSpriteDirection
- or $0
+ or 0
or d
- ld hl, OBJECT_FACING
+ ld hl, OBJECT_FACING_STEP
add hl, bc
ld [hl], a
ret
@@ -330,17 +329,17 @@ Function44e4: ; 44e4
ld hl, OBJECT_12
add hl, bc
ld a, [hl]
- add $2
- and $f
+ add 2
+ and %00001111
ld [hl], a
rrca
rrca
- and $3
+ and %00000011
ld d, a
call GetSpriteDirection
- or $0
+ or 0
or d
- ld hl, OBJECT_FACING
+ ld hl, OBJECT_FACING_STEP
add hl, bc
ld [hl], a
ret
@@ -358,12 +357,12 @@ Function4508: ; 4508
rrca
rrca
rrca
- and $3
+ and %00000011
ld d, a
call GetSpriteDirection
- or $0
+ or 0
or d
- ld hl, OBJECT_FACING
+ ld hl, OBJECT_FACING_STEP
add hl, bc
ld [hl], a
ret
@@ -371,11 +370,11 @@ Function4508: ; 4508
Function4529: ; 4529
call Function453f
- ld hl, OBJECT_08
+ ld hl, OBJECT_FACING
add hl, bc
ld a, [hl]
- or $0
- ld hl, OBJECT_FACING
+ or 0
+ ld hl, OBJECT_FACING_STEP
add hl, bc
ld [hl], a
ret
@@ -390,21 +389,21 @@ Function453f: ; 453f
ld hl, OBJECT_12
add hl, bc
ld a, [hl]
- and $f0
+ and %11110000
ld e, a
ld a, [hl]
inc a
- and $f
+ and %00001111
ld d, a
- cp $4
- jr c, .asm_4558
+ cp 4
+ jr c, .ok
ld d, 0
ld a, e
add $10
- and $30
+ and %00110000
ld e, a
-.asm_4558
+.ok
ld a, d
or e
ld [hl], a
@@ -413,14 +412,14 @@ Function453f: ; 453f
ld hl, .Directions
add hl, de
ld a, [hl]
- ld hl, OBJECT_08
+ ld hl, OBJECT_FACING
add hl, bc
ld [hl], a
ret
; 456a
.Directions ; 456a
- db $00, $0c, $04, $08
+ db DOWN << 2, RIGHT << 2, UP << 2, LEFT << 2
; 456e
Function456e: ; 456e
@@ -428,28 +427,28 @@ Function456e: ; 456e
rrca
rrca
add $10
- ld hl, OBJECT_FACING
+ ld hl, OBJECT_FACING_STEP
add hl, bc
ld [hl], a
ret
; 457b
Function457b: ; 457b
- ld hl, OBJECT_FACING
+ ld hl, OBJECT_FACING_STEP
add hl, bc
ld [hl], $15
ret
; 4582
Function4582: ; 4582
- ld hl, OBJECT_FACING
+ ld hl, OBJECT_FACING_STEP
add hl, bc
ld [hl], $14
ret
; 4589
Function4589: ; 4589
- ld hl, OBJECT_FACING
+ ld hl, OBJECT_FACING_STEP
add hl, bc
ld [hl], $17
ret
@@ -460,20 +459,20 @@ Function4590: ; 4590
add hl, bc
ld a, [hl]
inc a
- and $f
+ and %00001111
ld [hl], a
- and $8
+ and %00001000
jr z, Function45a4
- ld hl, OBJECT_FACING
+ ld hl, OBJECT_FACING_STEP
add hl, bc
ld [hl], $4
ret
; 45a4
Function45a4: ; 45a4
- ld hl, OBJECT_FACING
+ ld hl, OBJECT_FACING_STEP
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ret
; 45ab
@@ -483,34 +482,34 @@ Function45ab: ; 45ab
ld a, [hl]
inc a
ld [hl], a
- and $c
+ and %00001100
rrca
rrca
add $18
- ld hl, OBJECT_FACING
+ ld hl, OBJECT_FACING_STEP
add hl, bc
ld [hl], a
ret
; 45be
Function45be: ; 45be
- ld hl, OBJECT_FACING
+ ld hl, OBJECT_FACING_STEP
add hl, bc
ld [hl], $16
ret
; 45c5
Function45c5: ; 45c5
- ld a, [VariableSprites + 3]
+ ld a, [VariableSprites + SPRITE_BIG_DOLL - SPRITE_VARS]
ld d, $17
- cp $33
- jr z, .asm_45d4
- cp $47
- jr z, .asm_45d4
+ cp SPRITE_BIG_SNORLAX
+ jr z, .ok
+ cp SPRITE_BIG_LAPRAS
+ jr z, .ok
ld d, $16
-.asm_45d4
- ld hl, OBJECT_FACING
+.ok
+ ld hl, OBJECT_FACING_STEP
add hl, bc
ld [hl], d
ret
@@ -522,13 +521,13 @@ Function45da: ; 45da
inc [hl]
ld a, [hl]
- ld hl, OBJECT_FACING
+ ld hl, OBJECT_FACING_STEP
add hl, bc
and 2
ld a, $1c
- jr z, .asm_45eb
+ jr z, .ok
inc a
-.asm_45eb
+.ok
ld [hl], a
ret
; 45ed
@@ -538,14 +537,14 @@ Function45ed: ; 45ed
add hl, bc
inc [hl]
ld a, [hl]
- ld hl, OBJECT_FACING
+ ld hl, OBJECT_FACING_STEP
add hl, bc
and 4
ld a, $1e
- jr z, .asm_45fe
+ jr z, .ok
inc a
-.asm_45fe
+.ok
ld [hl], a
ret
; 4600
@@ -605,13 +604,13 @@ Function463f: ; 463f
ld hl, OBJECT_FLAGS
add hl, bc
bit 3, [hl]
- jr z, .asm_464f
+ jr z, .ok
ld hl, OBJECT_STANDING_TILE
add hl, bc
ld a, [hl]
call Function4661
-.asm_464f
+.ok
ld hl, OBJECT_STANDING_TILE
add hl, bc
ld a, [hl]
@@ -626,17 +625,17 @@ Function463f: ; 463f
Function4661: ; 4661
call Function188e
- jr z, .asm_466b
+ jr z, .set
call Function1875
- jr c, .asm_4672
+ jr c, .reset
-.asm_466b
+.set
ld hl, OBJECT_FLAGS
add hl, bc
set 3, [hl]
ret
-.asm_4672
+.reset
ld hl, OBJECT_FLAGS
add hl, bc
res 3, [hl]
@@ -659,29 +658,29 @@ Function467b: ; 467b
ld [hli], a
ld [hli], a
ld [hl], a
- ld hl, OBJECT_07
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
- ld [hl], $ff
+ ld [hl], STANDING
ret
; 4690
Function4690: ; 4690
- ld hl, OBJECT_07
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld [hl], a
ld hl, OBJECT_04
add hl, bc
bit 2, [hl]
- jr nz, .asm_46a6
+ jr nz, .ok
add a
add a
- and $c
- ld hl, OBJECT_08
+ and %00001100
+ ld hl, OBJECT_FACING
add hl, bc
ld [hl], a
-.asm_46a6
+.ok
; fallthrough
; 46a6
@@ -745,10 +744,10 @@ Function46d7: ; 46d7
GetStepVector: ; 46e9
; Return (x, y, duration, speed) in (d, e, a, h).
- ld hl, OBJECT_07
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld a, [hl]
- and $f
+ and %00001111
add a
add a
ld l, a
@@ -793,10 +792,10 @@ Function4730: ; 4730
; 4738
Function4738: ; 4738
- ld hl, OBJECT_07
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld a, [hl]
- and $3
+ and %00000011
ld [wd151], a
call Function46d7
ld a, [wd14e]
@@ -814,7 +813,7 @@ Function4759: ; 4759
push bc
ld e, a
ld d, 0
- ld hl, OBJECT_01
+ ld hl, OBJECT_MAP_OBJECT_INDEX
add hl, bc
ld a, [hl]
call GetMapObject
@@ -825,46 +824,46 @@ Function4759: ; 4759
; 4769
Function4769: ; 4769
- ld hl, OBJECT_01
+ ld hl, OBJECT_MAP_OBJECT_INDEX
add hl, bc
ld a, [hl]
- cp $ff
- jr z, .asm_477d
+ cp -1
+ jr z, .ok
push bc
call GetMapObject
- ld hl, $0004
+ ld hl, MAPOBJECT_FACING
add hl, bc
ld a, [hl]
pop bc
ret
-.asm_477d
- ld a, $6
+.ok
+ ld a, 6
ret
; 4780
-Function4780: ; 4780
+ClearObjectStructField27: ; 4780
ld hl, OBJECT_27
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ret
; 4787
-Function4787: ; 4787
+IncrementObjectStructField27: ; 4787
ld hl, OBJECT_27
add hl, bc
inc [hl]
ret
; 478d
-Function478d: ; 478d
+DecrementObjectStructField27: ; 478d
ld hl, OBJECT_27
add hl, bc
dec [hl]
ret
; 4793
-Function4793: ; 4793
+JumptoObjectStructField27: ; 4793
ld hl, OBJECT_27
add hl, bc
ld a, [hl]
@@ -873,21 +872,21 @@ Function4793: ; 4793
ret
; 479b
-Function479b: ; 479b
+ClearObjectStructField28: ; 479b
ld hl, OBJECT_28
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ret
; 47a2
-Function47a2: ; 47a2
+IncrementObjectStructField28: ; 47a2
ld hl, OBJECT_28
add hl, bc
inc [hl]
ret
; 47a8
-Function47a8: ; 47a8
+JumptoObjectStructField28: ; 47a8
ld hl, OBJECT_28
add hl, bc
ld a, [hl]
@@ -896,14 +895,14 @@ Function47a8: ; 47a8
ret
; 47b0
-Function47b0: ; 47b0
+GetValueObjectStructField28: ; 47b0
ld hl, OBJECT_28
add hl, bc
ld a, [hl]
ret
; 47b6
-Function47b6: ; 47b6
+SetValueObjectStructField28: ; 47b6
ld hl, OBJECT_28
add hl, bc
ld [hl], a
@@ -927,12 +926,12 @@ Function47bc: ; 47bc
call Function467b
ld hl, OBJECT_09
add hl, bc
- ld [hl], $1
+ ld [hl], 1
ret
; 47dd
Function47dd: ; 47dd
- call Function479b
+ call ClearObjectStructField28
call Function1a2f
ld a, [hl]
ld hl, .Pointers
@@ -978,49 +977,49 @@ Function4821: ; 4821
Function4822: ; 4822
call Random
ld a, [hRandomAdd]
- and 1
+ and %00000001
jp Function4af0
; 482c
Function482c: ; 482c
call Random
ld a, [hRandomAdd]
- and 1
- or 2
+ and %00000001
+ or %00000010
jp Function4af0
; 4838
Function4838: ; 4838
call Random
ld a, [hRandomAdd]
- and 3
+ and %00000011
jp Function4af0
; 4842
Function4842: ; 4842
call Random
ld a, [hRandomAdd]
- and $c
- ld hl, OBJECT_08
+ and %00001100
+ ld hl, OBJECT_FACING
add hl, bc
ld [hl], a
jp Function4b1d
; 4851
Function4851: ; 4851
- ld hl, OBJECT_08
+ ld hl, OBJECT_FACING
add hl, bc
ld a, [hl]
- and $c
+ and %00001100
ld d, a
call Random
ld a, [hRandomAdd]
- and $c
+ and %00001100
cp d
- jr nz, .asm_4865
- xor $c
+ jr nz, .keep
+ xor %00001100
-.asm_4865
+.keep
ld [hl], a
jp Function4b26
; 4869
@@ -1030,10 +1029,10 @@ Function4869: ; 4869
call Function467b
ld hl, OBJECT_11
add hl, bc
- ld [hl], $1
+ ld [hl], 1
ld hl, OBJECT_09
add hl, bc
- ld [hl], $5
+ ld [hl], 5
ret
; 487c
@@ -1084,7 +1083,7 @@ Function48a6: ; 48a6
; 48ac
Function48ac: ; 48ac
- call Function4793
+ call JumptoObjectStructField27
dw Function48b3
dw Function48f8
; 48b3
@@ -1094,20 +1093,20 @@ Function48b3: ; 48b3
add hl, bc
ld a, [hl]
call CheckPitTile
- jr z, .asm_48f5
+ jr z, .on_pit
ld hl, OBJECT_FLAGS
add hl, bc
bit 2, [hl]
res 2, [hl]
- jr z, .asm_48ee
+ jr z, .ok
ld hl, OBJECT_32
add hl, bc
ld a, [hl]
- and $3
- or $0
+ and %00000011
+ or 0
call Function4690
call Function6ec1
- jr c, .asm_48eb
+ jr c, .ok2
ld de, SFX_STRENGTH
call PlaySFX
call Function5538
@@ -1117,24 +1116,24 @@ Function48b3: ; 48b3
ld [hl], $f
ret
-.asm_48eb
+.ok2
call Function462a
-.asm_48ee
- ld hl, OBJECT_07
+.ok
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
- ld [hl], $ff
+ ld [hl], STANDING
ret
-.asm_48f5
- call Function4787
+.on_pit
+ call IncrementObjectStructField27
; fallthrough
; 48f8
Function48f8: ; 48f8
- ld hl, OBJECT_07
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
- ld [hl], $ff
+ ld [hl], STANDING
ret
; 48ff
@@ -1149,96 +1148,96 @@ Function48ff: ; 48ff
add hl, bc
ld a, [hl]
push bc
- call Function1ae5
- ld hl, OBJECT_07
+ call GetObjectStruct
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld a, [hl]
- cp $ff
- jr z, .asm_494a
+ cp STANDING
+ jr z, .standing
ld hl, OBJECT_NEXT_MAP_X
add hl, bc
ld a, [hl]
cp d
- jr z, .asm_492d
- jr c, .asm_4929
- ld a, $3
- jr .asm_493d
+ jr z, .equal
+ jr c, .less
+ ld a, 3
+ jr .done
-.asm_4929
- ld a, $2
- jr .asm_493d
+.less
+ ld a, 2
+ jr .done
-.asm_492d
+.equal
ld hl, OBJECT_NEXT_MAP_Y
add hl, bc
ld a, [hl]
cp e
- jr z, .asm_494a
- jr c, .asm_493b
- ld a, $0
- jr .asm_493d
+ jr z, .standing
+ jr c, .less2
+ ld a, 0
+ jr .done
-.asm_493b
- ld a, $1
+.less2
+ ld a, 1
-.asm_493d
+.done
ld d, a
- ld hl, OBJECT_07
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld a, [hl]
- and $c
+ and %00001100
or d
pop bc
jp Function5412
-.asm_494a
+.standing
pop bc
- ld hl, OBJECT_07
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
- ld [hl], $ff
+ ld [hl], STANDING
ld hl, OBJECT_11
add hl, bc
- ld [hl], $1
+ ld [hl], 1
ret
; 4958
Function4958: ; 4958
call Function467b
- ld hl, OBJECT_07
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
- ld [hl], $ff
+ ld [hl], STANDING
ld hl, OBJECT_11
add hl, bc
- ld [hl], $9
+ ld [hl], 9
ld hl, OBJECT_09
add hl, bc
- ld [hl], $4
+ ld [hl], 4
ret
; 496e
Function496e: ; 496e
call Function467b
- ld hl, OBJECT_07
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
- ld [hl], $ff
+ ld [hl], STANDING
ld hl, OBJECT_11
add hl, bc
- ld [hl], $a
+ ld [hl], 10
ld hl, OBJECT_09
add hl, bc
- ld [hl], $4
+ ld [hl], 4
ret
; 4984
Function4984: ; 4984
- call Function4793
+ call JumptoObjectStructField27
dw Function4996
dw Function499c
dw Function49b8
; 498d
Function498d: ; 498d
- call Function4793
+ call JumptoObjectStructField27
dw Function4996
dw Function499c
dw Function49c4
@@ -1246,14 +1245,14 @@ Function498d: ; 498d
Function4996: ; 4996
call Function467b
- call Function4787
+ call IncrementObjectStructField27
; fallthrough
; 499c
Function499c: ; 499c
ld hl, OBJECT_11
add hl, bc
- ld [hl], $1
+ ld [hl], 1
ld hl, OBJECT_32
add hl, bc
ld a, [hl]
@@ -1263,46 +1262,46 @@ Function499c: ; 499c
ld [hl], a
ld hl, OBJECT_09
add hl, bc
- ld [hl], $3
- call Function4787
+ ld [hl], 3
+ call IncrementObjectStructField27
ret
; 49b8
Function49b8: ; 49b8
- ld de, .data_49c0
+ ld de, .DirectionData_49c0
call Function49d0
jr Function4984
; 49c0
-.data_49c0 ; 49c0
- db $0c, $08, $00, $04
+.DirectionData_49c0 ; 49c0
+ db RIGHT << 2, LEFT << 2, DOWN << 2, UP << 2
; 49c4
Function49c4: ; 49c4
- ld de, .data_49cc
+ ld de, .DirectionData_49cc
call Function49d0
jr Function498d
; 49cc
-.data_49cc ; 49cc
- db $08, $0c, $04, $00
+.DirectionData_49cc ; 49cc
+ db LEFT << 2, RIGHT << 2, UP << 2, DOWN << 2
; 49d0
Function49d0: ; 49d0
- ld hl, OBJECT_08
+ ld hl, OBJECT_FACING
add hl, bc
ld a, [hl]
- and $c
+ and %00001100
rrca
rrca
push hl
ld l, a
- ld h, $0
+ ld h, 0
add hl, de
ld a, [hl]
pop hl
ld [hl], a
- call Function478d
+ call DecrementObjectStructField27
ret
; 49e5
@@ -1316,28 +1315,28 @@ Function49e5: ; 49e5
ld a, [hl]
inc a
add a
- add $0
+ add 0
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], a
- ld hl, OBJECT_07
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, de
ld a, [hl]
and 3
ld d, $e
- cp 0
- jr z, .asm_4a0f
- cp 1
- jr z, .asm_4a0f
+ cp DOWN
+ jr z, .ok
+ cp UP
+ jr z, .ok
ld d, $c
-.asm_4a0f
+.ok
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
ld [hl], d
ld hl, OBJECT_SPRITE_X_OFFSET
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ld hl, OBJECT_09
add hl, bc
ld [hl], $13
@@ -1349,16 +1348,16 @@ Function4a21: ; 4a21
call Function4aa8
ld hl, OBJECT_11
add hl, bc
- ld [hl], $8
+ ld [hl], 8
ld hl, OBJECT_STEP_DURATION
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
ld [hl], $f0
ld hl, OBJECT_SPRITE_X_OFFSET
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ld hl, OBJECT_09
add hl, bc
ld [hl], $13
@@ -1379,15 +1378,14 @@ Function4a46: ; 4a46
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], a
- ld hl, OBJECT_07
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, de
ld a, [hl]
- and 3
+ and %00000011
ld e, a
ld d, 0
ld hl, .data_4a81
- add hl, de
- add hl, de
+ add_n_times hl, de, 2
ld d, [hl]
inc hl
ld e, [hl]
@@ -1420,7 +1418,7 @@ Function4a89: ; 4a89
ld hl, OBJECT_STEP_DURATION
add hl, de
ld a, [hl]
- add $ff
+ add -1
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], a
@@ -1435,7 +1433,7 @@ Function4aa8: ; 4aa8
add hl, bc
ld a, [hl]
push bc
- call Function1ae5
+ call GetObjectStruct
ld d, b
ld e, c
pop bc
@@ -1451,7 +1449,7 @@ Function4abc: ; 4abc
call Function467b
ld hl, OBJECT_11
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ld hl, OBJECT_32
add hl, bc
ld a, [hl]
@@ -1470,20 +1468,20 @@ Function4abc: ; 4abc
Function4ade: ; 4ade
ld d, a
- and $3f
+ and %00111111
ld e, a
ld a, d
rlca
rlca
- and $3
+ and %00000011
ld d, a
inc d
- ld a, $1
-.asm_4aeb
+ ld a, 1
+.loop
dec d
ret z
add a
- jr .asm_4aeb
+ jr .loop
; 4af0
Function4af0: ; 4af0
@@ -1493,20 +1491,20 @@ Function4af0: ; 4af0
call Function463f
ld hl, OBJECT_11
add hl, bc
- ld [hl], $2
+ ld [hl], 2
ld hl, wd4cf
ld a, [$ffaf]
cp [hl]
- jr z, .asm_4b10
+ jr z, .ok
ld hl, OBJECT_09
add hl, bc
ld [hl], $7
ret
-.asm_4b10
+.ok
ld hl, OBJECT_09
add hl, bc
- ld [hl], $6
+ ld [hl], 6
ret
Function4b17: ; 4b17
@@ -1518,14 +1516,14 @@ Function4b17: ; 4b17
Function4b1d: ; 4b1d
call Random
ld a, [hRandomAdd]
- and $7f
+ and %01111111
jr Function4b2d
; 4b26
Function4b26: ; 4b26
call Random
ld a, [hRandomAdd]
- and $1f
+ and %00011111
; fallthrough
; 4b2d
@@ -1533,15 +1531,15 @@ Function4b2d: ; 4b2d
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], a
- ld hl, OBJECT_07
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
- ld [hl], $ff
+ ld [hl], STANDING
ld hl, OBJECT_11
add hl, bc
- ld [hl], $1
+ ld [hl], 1
ld hl, OBJECT_09
add hl, bc
- ld [hl], $3
+ ld [hl], 3
ret
; 4b45
@@ -1581,12 +1579,12 @@ Function4b79: ; 4b79
ret nz
ld hl, OBJECT_09
add hl, bc
- ld [hl], $1
+ ld [hl], 1
ret
; 4b86
Function4b86: ; 4b86
- call Function47a8
+ call JumptoObjectStructField28
dw Function4b8d
dw Function4ba9
; 4b8d
@@ -1603,7 +1601,7 @@ Function4b8d: ; 4b8d
ld hl, OBJECT_FLAGS
add hl, bc
res 3, [hl]
- call Function47a2
+ call IncrementObjectStructField28
ret
; 4ba9
@@ -1617,12 +1615,12 @@ Function4ba9: ; 4ba9
call Function4600
ld hl, OBJECT_09
add hl, bc
- ld [hl], $1
+ ld [hl], 1
ret
; 4bbf
Function4bbf: ; 4bbf
- call Function47a8
+ call JumptoObjectStructField28
dw Function4bca
dw Function4bd2
dw Function4bf2
@@ -1632,7 +1630,7 @@ Function4bbf: ; 4bbf
Function4bca: ; 4bca
ld hl, wd150
set 7, [hl]
- call Function47a2
+ call IncrementObjectStructField28
; fallthrough
; 4bd2
@@ -1650,7 +1648,7 @@ Function4bd2: ; 4bd2
ld hl, wd150
set 6, [hl]
set 4, [hl]
- call Function47a2
+ call IncrementObjectStructField28
ret
; 4bf2
@@ -1658,7 +1656,7 @@ Function4bf2: ; 4bf2
call Function46a6
ld hl, wd150
set 7, [hl]
- call Function47a2
+ call IncrementObjectStructField28
; fallthrough
; 4bfd
@@ -1674,12 +1672,12 @@ Function4bfd: ; 4bfd
call Function4600
ld hl, OBJECT_09
add hl, bc
- ld [hl], $1
+ ld [hl], 1
ret
; 4c18
Function4c18: ; 4c18
- call Function47a8
+ call JumptoObjectStructField28
dw Function4c23
dw Function4c32
dw Function4c42
@@ -1689,30 +1687,30 @@ Function4c18: ; 4c18
Function4c23: ; 4c23
ld hl, OBJECT_12
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], $10
- call Function47a2
+ call IncrementObjectStructField28
; fallthrough
; 4c32
Function4c32: ; 4c32
ld hl, OBJECT_11
add hl, bc
- ld [hl], $4
+ ld [hl], 4
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
- call Function47a2
+ call IncrementObjectStructField28
ret
; 4c42
Function4c42: ; 4c42
ld hl, OBJECT_12
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ld hl, OBJECT_31
add hl, bc
ld [hl], $10
@@ -1722,14 +1720,14 @@ Function4c42: ; 4c42
ld hl, OBJECT_FLAGS
add hl, bc
res 3, [hl]
- call Function47a2
+ call IncrementObjectStructField28
; fallthrough
; 4c5d
Function4c5d: ; 4c5d
ld hl, OBJECT_11
add hl, bc
- ld [hl], $4
+ ld [hl], 4
ld hl, OBJECT_31
add hl, bc
inc [hl]
@@ -1747,15 +1745,15 @@ Function4c5d: ; 4c5d
ret nz
ld hl, OBJECT_12
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ld hl, OBJECT_09
add hl, bc
- ld [hl], $1
+ ld [hl], 1
ret
; 4c89
Function4c89: ; 4c89
- call Function47a8
+ call JumptoObjectStructField28
dw Function4c9a
dw Function4caa
dw Function4cb3
@@ -1768,11 +1766,11 @@ Function4c89: ; 4c89
Function4c9a: ; 4c9a
ld hl, OBJECT_11
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], $10
- call Function47a2
+ call IncrementObjectStructField28
ret
; 4caa
@@ -1781,28 +1779,28 @@ Function4caa: ; 4caa
add hl, bc
dec [hl]
ret nz
- call Function47a2
+ call IncrementObjectStructField28
; fallthrough
; 4cb3
Function4cb3: ; 4cb3
ld hl, OBJECT_12
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ld hl, OBJECT_31
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], $10
- call Function47a2
+ call IncrementObjectStructField28
ret
; 4cc9
Function4cc9: ; 4cc9
ld hl, OBJECT_11
add hl, bc
- ld [hl], $4
+ ld [hl], 4
ld hl, OBJECT_31
add hl, bc
inc [hl]
@@ -1818,7 +1816,7 @@ Function4cc9: ; 4cc9
add hl, bc
dec [hl]
ret nz
- call Function47a2
+ call IncrementObjectStructField28
; fallthrough
; 4ceb
@@ -1826,14 +1824,14 @@ Function4ceb: ; 4ceb
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], $10
- call Function47a2
+ call IncrementObjectStructField28
ret
; 4cf5
Function4cf5: ; 4cf5
ld hl, OBJECT_11
add hl, bc
- ld [hl], $4
+ ld [hl], 4
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
@@ -1843,18 +1841,18 @@ Function4cf5: ; 4cf5
Function4d01: ; 4d01
ld hl, OBJECT_12
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ld hl, OBJECT_09
add hl, bc
- ld [hl], $1
+ ld [hl], 1
ret
; 4d14
Function4d14: ; 4d14
- call Function47a8
+ call JumptoObjectStructField28
dw Function4d1f
dw Function4d2e
dw Function4d4f
@@ -1864,11 +1862,11 @@ Function4d14: ; 4d14
Function4d1f: ; 4d1f
ld hl, OBJECT_11
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], $10
- call Function47a2
+ call IncrementObjectStructField28
; fallthrough
; 4d2e
@@ -1879,17 +1877,17 @@ Function4d2e: ; 4d2e
ret nz
ld hl, OBJECT_11
add hl, bc
- ld [hl], $2
+ ld [hl], 2
ld hl, OBJECT_12
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ld hl, OBJECT_31
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], $10
- call Function47a2
+ call IncrementObjectStructField28
; fallthrough
; 4d4f
@@ -1909,25 +1907,25 @@ Function4d4f: ; 4d4f
add hl, bc
dec [hl]
ret nz
- call Function47a2
+ call IncrementObjectStructField28
; fallthrough
; 4d6b
Function4d6b: ; 4d6b
ld hl, OBJECT_12
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ld hl, OBJECT_09
add hl, bc
- ld [hl], $1
+ ld [hl], 1
ret
; 4d7e
Function4d7e: ; 4d7e
- call Function47a8
+ call JumptoObjectStructField28
dw Function4d85
dw Function4d94
; 4d85
@@ -1935,11 +1933,11 @@ Function4d7e: ; 4d7e
Function4d85: ; 4d85
ld hl, OBJECT_STEP_DURATION
add hl, bc
- ld [hl], $8
+ ld [hl], 8
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
- ld [hl], $0
- call Function47a2
+ ld [hl], 0
+ call IncrementObjectStructField28
; fallthrough
; 4d94
@@ -1955,10 +1953,10 @@ Function4d94: ; 4d94
ret nz
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ld hl, OBJECT_09
add hl, bc
- ld [hl], $1
+ ld [hl], 1
ret
; 4daf
@@ -1971,12 +1969,12 @@ Function4db5: ; 4db5
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld a, [hl]
- and $1
- ld a, $1
- jr z, .asm_4dc2
- ld a, $0
+ and %00000001
+ ld a, 1
+ jr z, .yes
+ ld a, 0
-.asm_4dc2
+.yes
ld hl, OBJECT_11
add hl, bc
ld [hl], a
@@ -1987,12 +1985,12 @@ Function4dc8: ; 4dc8
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld a, [hl]
- and $1
- ld a, $4
- jr z, .asm_4dd5
- ld a, $5
+ and %00000001
+ ld a, 4
+ jr z, .yes
+ ld a, 5
-.asm_4dd5
+.yes
ld hl, OBJECT_11
add hl, bc
ld [hl], a
@@ -2000,23 +1998,23 @@ Function4dc8: ; 4dc8
; 4ddd
Function4ddd: ; 4ddd
- ld hl, OBJECT_07
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
- ld [hl], $ff
+ ld [hl], STANDING
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
ld hl, OBJECT_09
add hl, bc
- ld [hl], $1
+ ld [hl], 1
ret
; 4df0
Function4df0: ; 4df0
- ld hl, OBJECT_07
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
- ld [hl], $ff
+ ld [hl], STANDING
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
@@ -2031,12 +2029,12 @@ Function4dff: ; 4dff
ret nz
ld hl, OBJECT_09
add hl, bc
- ld [hl], $1
+ ld [hl], 1
ret
; 4e0c
Function4e0c: ; 4e0c
- call Function47a8
+ call JumptoObjectStructField28
dw Function4e13
dw Function4e21
; 4e13
@@ -2044,18 +2042,18 @@ Function4e0c: ; 4e0c
Function4e13: ; 4e13
call Function4769
call Function1a47
- ld hl, OBJECT_08
+ ld hl, OBJECT_FACING
add hl, bc
ld [hl], a
- call Function47a2
+ call IncrementObjectStructField28
; fallthrough
; 4e21
Function4e21: ; 4e21
call Function4fb2
- ld hl, OBJECT_07
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
- ld [hl], $ff
+ ld [hl], STANDING
ret
; 4e2b
@@ -2067,12 +2065,12 @@ Function4e2b: ; 4e2b
dec [hl]
ret nz
call Function4600
- ld hl, OBJECT_07
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
- ld [hl], $ff
+ ld [hl], STANDING
ld hl, OBJECT_09
add hl, bc
- ld [hl], $1
+ ld [hl], 1
ret
; 4e47
@@ -2088,7 +2086,7 @@ Function4e47: ; 4e47
Function4e56: ; 4e56
; AnimateStep?
- call Function47a8
+ call JumptoObjectStructField28
dw Function4e5d
dw Function4e65
; 4e5d
@@ -2096,7 +2094,7 @@ Function4e56: ; 4e56
Function4e5d: ; 4e5d
ld hl, wd150
set 7, [hl]
- call Function47a2
+ call IncrementObjectStructField28
; fallthrough
; 4e65
@@ -2109,17 +2107,17 @@ Function4e65: ; 4e65
ld hl, wd150
set 6, [hl]
call Function4600
- ld hl, OBJECT_07
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
- ld [hl], $ff
+ ld [hl], STANDING
ld hl, OBJECT_09
add hl, bc
- ld [hl], $1
+ ld [hl], 1
ret
; 4e83
Function4e83: ; 4e83
- call Function47a8
+ call JumptoObjectStructField28
dw Function4e8e
dw Function4ea4
dw Function4ead
@@ -2127,17 +2125,17 @@ Function4e83: ; 4e83
; 4e8e
Function4e8e: ; 4e8e
- ld hl, OBJECT_07
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
- ld [hl], $ff
+ ld [hl], STANDING
ld hl, OBJECT_12
add hl, bc
ld a, [hl]
- ld [hl], $2
+ ld [hl], 2
ld hl, OBJECT_STEP_DURATION
add hl, bc
- ld [hl], $2
- call Function47a2
+ ld [hl], 2
+ call IncrementObjectStructField28
; fallthrough
; 4ea4
@@ -2146,7 +2144,7 @@ Function4ea4: ; 4ea4
add hl, bc
dec [hl]
ret nz
- call Function47a2
+ call IncrementObjectStructField28
; fallthrough
; 4ead
@@ -2154,13 +2152,13 @@ Function4ead: ; 4ead
ld hl, OBJECT_29
add hl, bc
ld a, [hl]
- ld hl, OBJECT_08
+ ld hl, OBJECT_FACING
add hl, bc
ld [hl], a
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], $2
- call Function47a2
+ call IncrementObjectStructField28
; fallthrough
; 4ec0
@@ -2171,7 +2169,7 @@ Function4ec0: ; 4ec0
ret nz
ld hl, OBJECT_09
add hl, bc
- ld [hl], $1
+ ld [hl], 1
ret
; 4ecd
@@ -2188,7 +2186,7 @@ Function4ecd: ; 4ecd
ld hl, OBJECT_MAP_Y
add hl, bc
ld e, [hl]
- ld hl, OBJECT_01
+ ld hl, OBJECT_MAP_OBJECT_INDEX
add hl, bc
ld a, [hl]
ld b, a
@@ -2198,12 +2196,12 @@ Function4ecd: ; 4ecd
add hl, bc
res 2, [hl]
call Function4600
- ld hl, OBJECT_07
+ ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
- ld [hl], $ff
+ ld [hl], STANDING
ld hl, OBJECT_09
add hl, bc
- ld [hl], $1
+ ld [hl], 1
ret
; 4f04
@@ -2213,11 +2211,11 @@ Function4f04: ; 4f04
ld e, [hl]
inc hl
ld d, [hl]
- ld hl, OBJECT_00
+ ld hl, OBJECT_SPRITE
add hl, de
ld a, [hl]
and a
- jr z, .asm_4f30
+ jr z, .nope
ld hl, OBJECT_SPRITE_X
add hl, de
ld a, [hl]
@@ -2238,12 +2236,12 @@ Function4f04: ; 4f04
dec [hl]
ret nz
-.asm_4f30
+.nope
jp Function4357
; 4f33
Function4f33: ; 4f33
- call Function47a8
+ call JumptoObjectStructField28
dw Function4f3a
dw Function4f43
; 4f3a
@@ -2253,7 +2251,7 @@ Function4f3a: ; 4f3a
ld hl, OBJECT_29
add hl, bc
ld [hl], a
- call Function47a2
+ call IncrementObjectStructField28
; fallthrough
; 4f43
@@ -2267,7 +2265,7 @@ Function4f43: ; 4f43
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
- jr z, .asm_4f68
+ jr z, .ok
ld a, [hl]
call Function4f6c
ld hl, OBJECT_29
@@ -2279,7 +2277,7 @@ Function4f43: ; 4f43
ld [wd14f], a
ret
-.asm_4f68
+.ok
call Function4357
ret
; 4f6c
@@ -2296,18 +2294,18 @@ Function4f6c: ; 4f6c
; 4f77
Function4f77: ; 4f77
- call Function47a8 ; ????
+ call JumptoObjectStructField28 ; ????
; 4f7a
Function4f7a: ; 4f7a
- call Function47a8
+ call JumptoObjectStructField28
dw Function4f83
dw Function4f83
dw Function4f83
; 4f83
Function4f83: ; 4f83
- call Function47a8
+ call JumptoObjectStructField28
dw Function4f8a
dw Function4f99
; 4f8a
@@ -2319,7 +2317,7 @@ Function4f8a: ; 4f8a
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], $10
- call Function47a2
+ call IncrementObjectStructField28
; 4f99
Function4f99: ; 4f99
@@ -2332,10 +2330,10 @@ Function4f99: ; 4f99
ld [hl], $60
ld hl, OBJECT_12
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ld hl, OBJECT_09
add hl, bc
- ld [hl], $1
+ ld [hl], 1
ret
; 4fb2
@@ -2350,7 +2348,7 @@ Function4fb3: ; 4fb3
ld a, [hl]
srl a
srl a
- and 7
+ and %00000111
ld l, a
ld h, 0
ld de, .y
@@ -2449,14 +2447,14 @@ Function503d: ; 503d
Function5041: ; 5041
call Function5055
-.asm_5044
+.loop
xor a
ld [wc2ea], a
call Function505e
call Function506b
ld a, [wc2ea]
and a
- jr nz, .asm_5044
+ jr nz, .loop
ret
; 5055
@@ -2477,7 +2475,7 @@ Function505e: ; 505e
; 5065
Function5065: ; 5065
- ld a, $1
+ ld a, 1
ld [wc2ea], a
ret
; 506b
@@ -2500,7 +2498,7 @@ INCLUDE "engine/movement.asm"
Function54b8: ; 54b8
ld e, a
ld a, [wd4ce]
- cp $ff
+ cp -1
ret z
ld a, [wd4cd]
ld d, a
@@ -2534,25 +2532,25 @@ Function54e6: ; 54e6
ld hl, wd4d0
ld a, [hl]
and a
- jr z, .asm_5503
- cp $ff
- jr z, .asm_5503
+ jr z, .done
+ cp -1
+ jr z, .done
dec [hl]
ld e, a
ld d, 0
ld hl, wd4d1
add hl, de
inc e
- ld a, $ff
-.asm_54fc
+ ld a, -1
+.loop
ld d, [hl]
ld [hld], a
ld a, d
dec e
- jr nz, .asm_54fc
+ jr nz, .loop
ret
-.asm_5503
+.done
call Function550a
ret c
ld a, $3e
@@ -2561,20 +2559,20 @@ Function54e6: ; 54e6
Function550a: ; 550a
ld a, [wd4cd]
- cp $ff
- jr z, .asm_5520
+ cp -1
+ jr z, .nope
push bc
- call Function1ae5
- ld hl, OBJECT_00
+ call GetObjectStruct
+ ld hl, OBJECT_SPRITE
add hl, bc
ld a, [hl]
pop bc
and a
- jr z, .asm_5520
+ jr z, .nope
and a
ret
-.asm_5520
+.nope
ld a, $ff
ld [wd4ce], a
ld a, $47
@@ -2657,31 +2655,31 @@ Function5579: ; 5579
Function5582: ; 5582
ld de, ObjectStructs
ld a, $d
-.asm_5587
+.loop
push af
ld hl, OBJECT_04
add hl, de
bit 7, [hl]
- jr z, .asm_55a1
- ld hl, OBJECT_00
+ jr z, .next
+ ld hl, OBJECT_SPRITE
add hl, de
ld a, [hl]
and a
- jr z, .asm_55a1
+ jr z, .next
push bc
xor a
- ld bc, ObjectStruct2 - ObjectStruct1
+ ld bc, OBJECT_STRUCT_LENGTH
call ByteFill
pop bc
-.asm_55a1
- ld hl, ObjectStruct2 - ObjectStruct1
+.next
+ ld hl, OBJECT_STRUCT_LENGTH
add hl, de
ld d, h
ld e, l
pop af
dec a
- jr nz, .asm_5587
+ jr nz, .loop
ret
; 55ac
@@ -2696,9 +2694,9 @@ Function55ac: ; 55ac
Function55b9: ; 55b9
ld hl, wc2f0
- ld [hl], $ff
+ ld [hl], -1
inc hl
- ld [hl], $ff
+ ld [hl], -1
inc hl
ld a, [de]
inc de
@@ -2722,7 +2720,7 @@ Function55b9: ; 55b9
inc hl
ld [hl], e
inc hl
- ld [hl], $ff
+ ld [hl], -1
ret
; 55e0
@@ -2732,44 +2730,44 @@ Function55e0:: ; 55e0
ret z
ld bc, ObjectStructs
xor a
-.asm_55ea
+.loop
ld [$ffaf], a
- call Function1af1
- jr z, .asm_55f4
+ call GetObjectSprite
+ jr z, .ok
call Function565c
-.asm_55f4
- ld hl, ObjectStruct2 - ObjectStruct1
+.ok
+ ld hl, OBJECT_STRUCT_LENGTH
add hl, bc
ld b, h
ld c, l
ld a, [$ffaf]
inc a
- cp $d
- jr nz, .asm_55ea
+ cp NUM_OBJECT_STRUCTS
+ jr nz, .loop
ret
; 5602
Function5602: ; 5602
call Function5645
- ld a, $0
+ ld a, 0
call Function5629
ld a, [wd459]
bit 7, a
- jr z, .asm_5619
+ jr z, .ok
ld a, [$ffe0]
and a
- jr z, .asm_5619
+ jr z, .ok
call Function5629
-.asm_5619
+.ok
call Function5920
ret
; 561d
Function561d: ; 561d
call Function5645
- ld a, $0
+ ld a, 0
call Function5629
call Function5920
ret
@@ -2779,15 +2777,15 @@ Function5629: ; 5629
cp $10
ret nc
call GetMapObject
- ld hl, $0000
+ ld hl, MAPOBJECT_VRAM_ID
add hl, bc
ld a, [hl]
- cp $ff
+ cp MAPOBJECT_NOT_VISIBLE
ret z
cp $d
ret nc
- call Function1ae5
- call Function1af1
+ call GetObjectStruct
+ call GetObjectSprite
ret z
call Function5673
ret
@@ -2796,17 +2794,17 @@ Function5629: ; 5629
Function5645: ; 5645
xor a
ld bc, ObjectStructs
-.asm_5649
+.loop
ld [$ffaf], a
call Function5680
- ld hl, ObjectStruct2 - ObjectStruct1
+ ld hl, OBJECT_STRUCT_LENGTH
add hl, bc
ld b, h
ld c, l
ld a, [$ffaf]
inc a
- cp $d
- jr nz, .asm_5649
+ cp NUM_OBJECT_STRUCTS
+ jr nz, .loop
ret
; 565c
@@ -2832,9 +2830,9 @@ Function5673: ; 5673
; 5680
Function5680: ; 5680
- ld hl, OBJECT_FACING
+ ld hl, OBJECT_FACING_STEP
add hl, bc
- ld [hl], $ff
+ ld [hl], STANDING
scf
ret
; 5688
@@ -2867,26 +2865,26 @@ Function56a3: ; 56a3
inc e
ld a, [XCoord]
cp d
- jr z, .asm_56bc
- jr nc, .asm_56cb
+ jr z, .equal_x
+ jr nc, .nope
add $b
cp d
- jr c, .asm_56cb
+ jr c, .nope
-.asm_56bc
+.equal_x
ld a, [YCoord]
cp e
- jr z, .asm_56c9
- jr nc, .asm_56cb
+ jr z, .equal_y
+ jr nc, .nope
add $a
cp e
- jr c, .asm_56cb
+ jr c, .nope
-.asm_56c9
+.equal_y
xor a
ret
-.asm_56cb
+.nope
scf
ret
; 56cd
@@ -2902,27 +2900,27 @@ Function56cd: ; 56cd
add [hl]
add d
cp $f0
- jr nc, .asm_56e5
+ jr nc, .ok1
cp $a0
- jp nc, .asm_5768
+ jp nc, .nope
-.asm_56e5
- and $7
- ld d, $2
- cp $4
- jr c, .asm_56ef
- ld d, $3
+.ok1
+ and %00000111
+ ld d, 2
+ cp 4
+ jr c, .ok2
+ ld d, 3
-.asm_56ef
+.ok2
ld a, [hl]
srl a
srl a
srl a
cp $14
- jr c, .asm_56fc
+ jr c, .ok3
sub $20
-.asm_56fc
+.ok3
ld [$ffbd], a
ld a, [wd14d]
ld e, a
@@ -2934,76 +2932,76 @@ Function56cd: ; 56cd
add [hl]
add e
cp $f0
- jr nc, .asm_5715
+ jr nc, .ok4
cp $90
- jr nc, .asm_5768
+ jr nc, .nope
-.asm_5715
- and $7
- ld e, $2
- cp $4
- jr c, .asm_571f
- ld e, $3
+.ok4
+ and %00000111
+ ld e, 2
+ cp 4
+ jr c, .ok5
+ ld e, 3
-.asm_571f
+.ok5
ld a, [hl]
srl a
srl a
srl a
cp $12
- jr c, .asm_572c
+ jr c, .ok6
sub $20
-.asm_572c
+.ok6
ld [$ffbe], a
ld hl, OBJECT_PALETTE
add hl, bc
bit 7, [hl]
- jr z, .asm_573e
+ jr z, .ok7
ld a, d
- add $2
+ add 2
ld d, a
ld a, e
- add $2
+ add 2
ld e, a
-.asm_573e
+.ok7
ld a, d
ld [$ffbf], a
-.asm_5741
+.loop
ld a, [$ffbf]
ld d, a
ld a, [$ffbe]
add e
dec a
cp $12
- jr nc, .asm_5763
+ jr nc, .ok9
ld b, a
-.asm_574d
+.next
ld a, [$ffbd]
add d
dec a
cp $14
- jr nc, .asm_5760
+ jr nc, .ok8
ld c, a
push bc
call GetTileCoord
pop bc
ld a, [hl]
cp $60
- jr nc, .asm_5768
+ jr nc, .nope
-.asm_5760
+.ok8
dec d
- jr nz, .asm_574d
+ jr nz, .next
-.asm_5763
+.ok9
dec e
- jr nz, .asm_5741
+ jr nz, .loop
and a
ret
-.asm_5768
+.nope
scf
ret
; 576a
@@ -3019,7 +3017,7 @@ Function5771: ; 5771
ld [wd14e], a
ld [wd14f], a
ld [wd150], a
- ld a, $ff
+ ld a, -1
ld [wd151], a
ret
; 5781
@@ -3027,21 +3025,21 @@ Function5771: ; 5771
Function5781: ; 5781
ld bc, ObjectStructs
xor a
-.asm_5785
+.loop
ld [$ffaf], a
- call Function1af1
- jr z, .asm_578f
+ call GetObjectSprite
+ jr z, .next
call Function437b
-.asm_578f
- ld hl, ObjectStruct2 - ObjectStruct1
+.next
+ ld hl, OBJECT_STRUCT_LENGTH
add hl, bc
ld b, h
ld c, l
ld a, [$ffaf]
inc a
- cp $d
- jr nz, .asm_5785
+ cp NUM_OBJECT_STRUCTS
+ jr nz, .loop
ret
; 579d
@@ -3062,11 +3060,11 @@ Function579d: ; 579d
Function57bc: ; 57bc
ld hl, wd45b
bit 7, [hl]
- jr nz, .asm_57c4
+ jr nz, .ok
ret
-.asm_57c4
- ld a, $0
+.ok
+ ld a, 0
ld [PlayerAction], a
ret
; 57ca
@@ -3076,20 +3074,20 @@ Function57ca: ; 57ca
bit 5, [hl]
ret z
ld a, [wd45b]
- and $3
+ and 3
add a
add a
jr Function57db
; 57d9
Function57d9: ; 57d9
- ld a, $0
+ ld a, 0
; fallthrough
; 57db
Function57db: ; 57db
ld bc, PlayerStruct
- call Function1af8
+ call SetSpriteDirection
ret
; 57e2
@@ -3098,20 +3096,20 @@ Function57e2: ; 57e2
and $80
ret z
ld bc, $0000 ; debug?
- ld hl, OBJECT_08
+ ld hl, OBJECT_FACING
add hl, bc
ld a, [hl]
or d
ld [hl], a
ld a, d
swap a
- and $7
+ and %00000111
ld d, a
ld bc, PlayerStruct
ld hl, OBJECT_PALETTE
add hl, bc
ld a, [hl]
- and $f8
+ and %11111000
or d
ld [hl], a
ret
@@ -3144,7 +3142,7 @@ Function581f:: ; 581f
; 5826
Function5826: ; 5826
- ld a, $ff
+ ld a, -1
ld [wd4cd], a
ret
; 582c
@@ -3160,7 +3158,7 @@ Function582c: ; 582c
ld [hl], $13
ld hl, OBJECT_09
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ld a, [$ffb0]
ld [wd4ce], a
ret
@@ -3168,16 +3166,16 @@ Function582c: ; 582c
Function5847: ; 5847
ld a, [wd4ce]
- cp $ff
+ cp -1
ret z
- call Function1ae5
+ call GetObjectStruct
callba Function58e3
- ld a, $ff
+ ld a, -1
ld [wd4ce], a
ret
; 585c
-Function585c:: ; 585c
+SetFlagsForMovement_1:: ; 585c
ld a, c
call Function18de
ret c
@@ -3204,42 +3202,42 @@ Function586e: ; 586e
Function587a: ; 587a
ld bc, ObjectStructs
xor a
-.asm_587e
+.loop
push af
- call Function1af1
- jr z, .asm_588a
+ call GetObjectSprite
+ jr z, .next
ld hl, OBJECT_FLAGS
add hl, bc
set 5, [hl]
-.asm_588a
- ld hl, ObjectStruct2 - ObjectStruct1
+.next
+ ld hl, OBJECT_STRUCT_LENGTH
add hl, bc
ld b, h
ld c, l
pop af
inc a
- cp $d
- jr nz, .asm_587e
+ cp NUM_OBJECT_STRUCTS
+ jr nz, .loop
ret
; 5897
-Function5897:: ; 5897
+_SetFlagsForMovement_2:: ; 5897
ld a, [wd4cd]
- cp $ff
+ cp -1
ret z
push bc
- call Function1ae5
- ld hl, OBJECT_01
+ call GetObjectStruct
+ ld hl, OBJECT_MAP_OBJECT_INDEX
add hl, bc
ld a, [hl]
pop bc
cp c
ret nz
ld a, [wd4ce]
- cp $ff
+ cp -1
ret z
- call Function1ae5
+ call GetObjectStruct
ld hl, OBJECT_FLAGS
add hl, bc
res 5, [hl]
@@ -3250,23 +3248,23 @@ Function58b9:: ; 58b9
push bc
ld bc, ObjectStructs
xor a
-.asm_58be
+.loop
push af
- call Function1af1
- jr z, .asm_58ca
+ call GetObjectSprite
+ jr z, .next
ld hl, OBJECT_FLAGS
add hl, bc
res 5, [hl]
-.asm_58ca
- ld hl, ObjectStruct2 - ObjectStruct1
+.next
+ ld hl, OBJECT_STRUCT_LENGTH
add hl, bc
ld b, h
ld c, l
pop af
inc a
- cp $d
- jr nz, .asm_58be
+ cp NUM_OBJECT_STRUCTS
+ jr nz, .loop
pop bc
ret
; 58d8
@@ -3281,14 +3279,14 @@ Function58d8: ; 58d8
; 58e3
Function58e3: ; 58e3
- ld hl, OBJECT_01
+ ld hl, OBJECT_MAP_OBJECT_INDEX
add hl, bc
ld a, [hl]
- cp $ff
+ cp -1
jp z, Function5903
push bc
call GetMapObject
- ld hl, $0004
+ ld hl, MAPOBJECT_FACING
add hl, bc
ld a, [hl]
pop bc
@@ -3297,7 +3295,7 @@ Function58e3: ; 58e3
ld [hl], a
ld hl, OBJECT_09
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ret
; 5903
@@ -3315,7 +3313,7 @@ Function5903: ; 5903
ld [hl], a
ld hl, OBJECT_09
add hl, bc
- ld [hl], $0
+ ld [hl], 0
ret
.data_591c
@@ -3330,7 +3328,7 @@ Function5920:: ; 5920
ld [$ffbd], a
ld a, [hOAMUpdate]
push af
- ld a, $1
+ ld a, 1
ld [hOAMUpdate], a
call Function5991
call Function593a
@@ -3343,10 +3341,10 @@ Function593a: ; 593a
ld a, [VramState]
bit 1, a
ld b, $a0
- jr z, .asm_5945
+ jr z, .ok
ld b, $70
-.asm_5945
+.ok
ld a, [$ffbd]
cp b
ret nc
@@ -3355,11 +3353,11 @@ Function593a: ; 593a
ld de, OBJECT_04
ld a, b
ld c, $a0
-.asm_5952
+.loop
ld [hl], c
add hl, de
cp l
- jr nz, .asm_5952
+ jr nz, .loop
ret
; 5958
@@ -3372,12 +3370,12 @@ Function5958: ; 5958
ld a, [wd14d]
ld e, a
ld bc, ObjectStructs
- ld a, $d
+ ld a, NUM_OBJECT_STRUCTS
-.asm_5968
+.loop
push af
- call Function1af1
- jr z, .asm_597c
+ call GetObjectSprite
+ jr z, .skip
ld hl, OBJECT_SPRITE_X
add hl, bc
@@ -3391,14 +3389,14 @@ Function5958: ; 5958
add e
ld [hl], a
-.asm_597c
- ld hl, ObjectStruct2 - ObjectStruct1
+.skip
+ ld hl, OBJECT_STRUCT_LENGTH
add hl, bc
ld b, h
ld c, l
pop af
dec a
- jr nz, .asm_5968
+ jr nz, .loop
xor a
ld [wd14c], a
@@ -3431,10 +3429,10 @@ Function59a4: ; 59a4
ld hl, wc2eb
.loop
push hl
- call Function1af1
+ call GetObjectSprite
jr z, .skip
- ld hl, OBJECT_FACING
+ ld hl, OBJECT_FACING_STEP
add hl, bc
ld a, [hl]
cp -1
@@ -3453,7 +3451,7 @@ Function59a4: ; 59a4
jr .add
.skip
- ld hl, ObjectStruct2 - ObjectStruct1
+ ld hl, OBJECT_STRUCT_LENGTH
add hl, bc
ld b, h
ld c, l
@@ -3461,7 +3459,7 @@ Function59a4: ; 59a4
jr .next
.add
- ld hl, ObjectStruct2 - ObjectStruct1
+ ld hl, OBJECT_STRUCT_LENGTH
add hl, bc
ld b, h
ld c, l
@@ -3473,7 +3471,7 @@ Function59a4: ; 59a4
.next
inc d
ld a, d
- cp $d
+ cp NUM_OBJECT_STRUCTS
jr nz, .loop
ret
; 59f3
@@ -3483,7 +3481,7 @@ Function59f3: ; 59f3
.next
ld a, [hli]
ld d, a
- and $f0
+ and %11110000
ret z
cp c
jr nz, .next
@@ -3491,7 +3489,7 @@ Function59f3: ; 59f3
push bc
push hl
ld a, d
- and $f
+ and %00001111
call Function5ac2
call Function5a0d
pop hl
@@ -3500,44 +3498,44 @@ Function59f3: ; 59f3
; 5a0d
Function5a0d: ; 5a0d
- ld hl, OBJECT_SPRITE
+ ld hl, OBJECT_SPRITE_TILE
add hl, bc
ld a, [hl]
- and $7f
+ and %01111111
ld [$ffc1], a
xor a
bit 7, [hl]
- jr nz, .asm_5a1d
- or 8
-.asm_5a1d
+ jr nz, .skip1
+ or %00001000
+.skip1
ld hl, OBJECT_FLAGS
add hl, bc
ld e, [hl]
bit 7, e
- jr z, .asm_5a28
- or $80
-.asm_5a28
+ jr z, .skip2
+ or %10000000
+.skip2
bit 4, e
- jr z, .asm_5a2e
- or $10
-.asm_5a2e
+ jr z, .skip3
+ or %00010000
+.skip3
ld hl, OBJECT_PALETTE
add hl, bc
ld d, a
ld a, [hl]
- and 7
+ and %00000111
or d
ld d, a
xor a
bit 3, e
- jr z, .asm_5a3f
- or $80
-.asm_5a3f
+ jr z, .skip4
+ or %10000000
+.skip4
ld [$ffc2], a
ld hl, OBJECT_SPRITE_X
@@ -3570,7 +3568,7 @@ Function5a0d: ; 5a0d
add e
ld [$ffc0], a
- ld hl, OBJECT_FACING
+ ld hl, OBJECT_FACING_STEP
add hl, bc
ld a, [hl]
cp -1
@@ -3616,9 +3614,9 @@ Function5a0d: ; 5a0d
ld a, [$ffc1]
bit 2, e
- jr z, .asm_5aa3
+ jr z, .nope1
xor a
-.asm_5aa3
+.nope1
add [hl]
inc hl
@@ -3627,11 +3625,11 @@ Function5a0d: ; 5a0d
ld a, e
bit 1, a
- jr z, .asm_5aaf
+ jr z, .nope2
ld a, [$ffc2]
or e
-.asm_5aaf
- and $f0
+.nope2
+ and %11110000
or d
ld [bc], a
inc c
@@ -3657,8 +3655,7 @@ Function5ac2: ; 5ac2
ld c, a
ld b, 0
ld hl, .Addresses
- add hl, bc
- add hl, bc
+ add_n_times hl, bc, 2
ld c, [hl]
inc hl
ld b, [hl]
diff --git a/engine/map_setup.asm b/engine/map_setup.asm
index 8c10954b3..f1a5db01a 100644
--- a/engine/map_setup.asm
+++ b/engine/map_setup.asm
@@ -306,7 +306,7 @@ MapSetupCommands: ; 15440
dbw BANK(Function24cd), Function24cd
dbw BANK(Function28e3), Function28e3
dbw BANK(Function289d), Function289d
- dbw BANK(Function2879), Function2879
+ dbw BANK(BufferScreen), BufferScreen
dbw BANK(Function1047cf), Function1047cf
dbw BANK(LoadTilesetHeader), LoadTilesetHeader
dbw BANK(Function104750), Function104750
diff --git a/engine/pack.asm b/engine/pack.asm
index e765bab7e..79794098a 100644
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -62,7 +62,7 @@ Function10056: ; 10056 (4:4056)
Function10067: ; 10067 (4:4067)
ld hl, MenuDataHeader_0x10a4f
- call Function1d3c
+ call CopyMenuDataHeader
ld a, [wd0d9]
ld [wcf88], a
ld a, [wd0df]
@@ -90,7 +90,7 @@ Function10094: ; 10094 (4:4094)
Function100a6: ; 100a6 (4:40a6)
ld hl, MenuDataHeader_0x10a7f
- call Function1d3c
+ call CopyMenuDataHeader
ld a, [wd0da]
ld [wcf88], a
ld a, [wd0e0]
@@ -137,7 +137,7 @@ Function100e8: ; 100e8 (4:40e8)
.asm_10110
push de
call LoadMenuDataHeader
- call Function1d81
+ call InterpretMenu2
call Function1c07
pop hl
ret c
@@ -220,7 +220,7 @@ Function10186: ; 10186 (4:4186)
Function10198: ; 10198 (4:4198)
ld hl, MenuDataHeader_0x10aaf
- call Function1d3c
+ call CopyMenuDataHeader
ld a, [wd0db]
ld [wcf88], a
ld a, [wd0e1]
@@ -289,7 +289,7 @@ Function101c5: ; 101c5 (4:41c5)
.asm_10235
push de
call LoadMenuDataHeader
- call Function1d81
+ call InterpretMenu2
call Function1c07
pop hl
ret c
@@ -709,7 +709,7 @@ Function104e9: ; 104e9 (4:44e9)
Function104fa: ; 104fa (4:44fa)
ld hl, MenuDataHeader_0x10a4f
- call Function1d3c
+ call CopyMenuDataHeader
ld a, [wd0d9]
ld [wcf88], a
ld a, [wd0df]
@@ -737,7 +737,7 @@ Function10527: ; 10527 (4:4527)
Function10539: ; 10539 (4:4539)
ld hl, MenuDataHeader_0x10a7f
- call Function1d3c
+ call CopyMenuDataHeader
ld a, [wd0da]
ld [wcf88], a
ld a, [wd0e0]
@@ -788,7 +788,7 @@ Function10594: ; 10594 (4:4594)
Function105a6: ; 105a6 (4:45a6)
ld hl, MenuDataHeader_0x10aaf
- call Function1d3c
+ call CopyMenuDataHeader
ld a, [wd0db]
ld [wcf88], a
ld a, [wd0e1]
@@ -821,7 +821,7 @@ Function105dc: ; 105dc (4:45dc)
.asm_105ed
push de
call LoadMenuDataHeader
- call Function1d81
+ call InterpretMenu2
call Function1c07
pop hl
ret c
@@ -992,7 +992,7 @@ Function106d9: ; 106d9 (4:46d9)
xor a
call Function10762
ld hl, MenuDataHeader_0x10a67
- call Function1d3c
+ call CopyMenuDataHeader
ld a, [wd0d9]
ld [wcf88], a
ld a, [wd0df]
@@ -1008,7 +1008,7 @@ Function106ff: ; 106ff (4:46ff)
ld a, $2
call Function10762
ld hl, MenuDataHeader_0x10a97
- call Function1d3c
+ call CopyMenuDataHeader
ld a, [wd0da]
ld [wcf88], a
ld a, [wd0e0]
@@ -1033,7 +1033,7 @@ Function1073b: ; 1073b (4:473b)
ld a, $1
call Function10762
ld hl, MenuDataHeader_0x10ac7
- call Function1d3c
+ call CopyMenuDataHeader
ld a, [wd0db]
ld [wcf88], a
ld a, [wd0e1]
@@ -1223,7 +1223,7 @@ Function1085a: ; 1085a (4:485a)
push hl
call Function10762
pop hl
- call Function1d3c
+ call CopyMenuDataHeader
call Function350c
ret
diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm
index c712e4d7a..f68e1166e 100644
--- a/engine/phone_scripts.asm
+++ b/engine/phone_scripts.asm
@@ -654,7 +654,7 @@ UnknownScript_0xbd3d1:
UnknownScript_0xbd3f6:
farscall UnknownScript_0xbde3f
if_equal $0, UnknownScript_0xbd412
- checkflag ENGINE_51
+ checkflag ENGINE_DAILY_BUG_CONTEST
iftrue UnknownScript_0xbd412
checkcode VAR_WEEKDAY
if_equal $2, UnknownScript_0xbd416
@@ -680,7 +680,7 @@ UnknownScript_0xbd428:
farscall UnknownScript_0xbe1b6
farscall UnknownScript_0xbde3f
if_equal $0, UnknownScript_0xbd44c
- checkflag ENGINE_51
+ checkflag ENGINE_DAILY_BUG_CONTEST
iftrue UnknownScript_0xbd44c
checkcode VAR_WEEKDAY
if_equal $2, UnknownScript_0xbd480
@@ -1381,7 +1381,7 @@ UnknownScript_0xbda35:
iftrue UnknownScript_0xbda67
farscall UnknownScript_0xbde3f
if_equal $0, UnknownScript_0xbda5f
- checkflag ENGINE_51
+ checkflag ENGINE_DAILY_BUG_CONTEST
iftrue UnknownScript_0xbda5f
checkcode VAR_WEEKDAY
if_equal $2, UnknownScript_0xbda63
@@ -1403,7 +1403,7 @@ UnknownScript_0xbda6e:
farscall UnknownScript_0xbe1b6
farscall UnknownScript_0xbde3f
if_equal $0, UnknownScript_0xbda92
- checkflag ENGINE_51
+ checkflag ENGINE_DAILY_BUG_CONTEST
iftrue UnknownScript_0xbda92
checkcode VAR_WEEKDAY
if_equal $2, UnknownScript_0xbda9e
@@ -3104,27 +3104,27 @@ String_be65b: db "Sister@"
String_be662: db "Brother@"
-UnknownScript_0xbe66a:: ; 0xbe66a
+TalkToTrainerScript:: ; 0xbe66a
faceplayer
trainerstatus $2
- iftrue UnknownScript_0xbe698
+ iftrue AlreadyBeatenTrainerScript
loadtrainerdata
playrammusic
- jump UnknownScript_0xbe68a
+ jump StartBattleWithMapTrainerScript
; 0xbe675
-UnknownScript_0xbe675:: ; 0xbe675
+SeenByTrainerScript:: ; 0xbe675
loadtrainerdata
playrammusic
- showemote $0, $fe, 30
+ showemote EMOTE_SHOCK, $fe, 30
callasm Function831e
applymovement2 MovementBuffer
writepersonxy $fe
faceperson $0, $fe
- jump UnknownScript_0xbe68a
+ jump StartBattleWithMapTrainerScript
; 0xbe68a
-UnknownScript_0xbe68a: ; 0xbe68a
+StartBattleWithMapTrainerScript: ; 0xbe68a
loadfont
trainertext $0
closetext
@@ -3135,6 +3135,6 @@ UnknownScript_0xbe68a: ; 0xbe68a
trainerstatus $1
loadvar wd04d, $ff
-UnknownScript_0xbe698:
+AlreadyBeatenTrainerScript:
scripttalkafter
; 0xbe699
diff --git a/engine/scripting.asm b/engine/scripting.asm
index 3012d14b3..6fd683fb7 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -1,9 +1,9 @@
; Event scripting commands.
-Function96c56:: ; 96c56
+EnableScriptMode:: ; 96c56
push af
- ld a, 1
+ ld a, SCRIPT_READ
ld [ScriptMode], a
pop af
ret
@@ -346,7 +346,7 @@ JumpTextFacePlayerScript: ; 0x96e79
faceplayer
JumpTextScript: ; 0x96e7a
loadfont
- repeattext $ff, $ff
+ repeattext -1, -1
closetext
loadmovesprites
end
@@ -385,7 +385,7 @@ Script_2writetext: ; 0x96e9b
ld h, a
ld a, [ScriptBank]
ld b, a
- call Function269a
+ call MapTextbox
ret
; 0x96eab
@@ -400,7 +400,7 @@ Script_3writetext: ; 0x96eab
ld l, a
call GetScriptByte
ld h, a
- call Function269a
+ call MapTextbox
ret
; 0x96ebb
@@ -414,27 +414,27 @@ Script_repeattext: ; 0x96ebb
ld l, a
call GetScriptByte
ld h, a
- cp $ff
- jr nz, .asm_96ed8 ; 0x96ec5 $11
+ cp -1
+ jr nz, .done ; 0x96ec5 $11
ld a, l
- cp $ff
- jr nz, .asm_96ed8 ; 0x96eca $c
+ cp -1
+ jr nz, .done ; 0x96eca $c
ld hl, wd44e
ld a, [hli]
ld b, a
ld a, [hli]
ld h, [hl]
ld l, a
- call Function269a
+ call MapTextbox
ret
-.asm_96ed8
+.done
ret
; 0x96ed9
Script_closetext: ; 0x96ed9
; script command 0x54
- jp Functiona46
+ jp CloseText
; 0x96edc
Script_keeptextopen: ; 0x96edc
@@ -445,7 +445,7 @@ Script_keeptextopen: ; 0x96edc
ld a, $1
ld [$ffd8], a
call WaitBGMap
- call Functionaaf
+ call KeepTextOpen
pop af
ld [$ffd8], a
ret
@@ -456,9 +456,9 @@ Script_yesorno: ; 0x96eed
call YesNoBox
ld a, 0
- jr c, .asm_96ef6 ; 0x96ef2 $2
+ jr c, .no ; 0x96ef2 $2
ld a, 1
-.asm_96ef6
+.no
ld [ScriptVar], a
ret
; 0x96efa
@@ -474,16 +474,16 @@ Script_loadmenudata: ; 0x96efa
ld h, a
ld de, LoadMenuDataHeader
ld a, [ScriptBank]
- call Function26b7
- call Function1ad2
+ call Call_a_de
+ call DrawOnMap
ret
; 0x96f0f
Script_writebackup: ; 0x96f0f
; script command 0x50
- call Function1c17
- call Function1ad2
+ call WriteBackup
+ call DrawOnMap
ret
; 0x96f16
@@ -498,14 +498,14 @@ Script_pokepic: ; 0x96f16
ld a, [ScriptVar]
.ok
ld [CurPartySpecies], a
- callba Function244e3
+ callba Pokepic
ret
; 0x96f29
Script_pokepicyesorno: ; 0x96f29
; script command 0x57
- callba Function24528
+ callba PokepicYesOrNo
ret
; 0x96f30
@@ -513,7 +513,7 @@ Script_interpretmenu2: ; 0x96f30
; script command 0x59
ld a, [ScriptBank]
- ld hl, Function1d81
+ ld hl, InterpretMenu2
rst FarCall
ld a, [wcfa9]
jr nc, .ok
@@ -527,7 +527,7 @@ Script_interpretmenu: ; 0x96f41
; script command 0x58
ld a, [ScriptBank]
- ld hl, Function202a
+ ld hl, InterpretMenu
rst FarCall
ld a, [wcf88]
jr nc, .ok
@@ -543,10 +543,10 @@ Script_storetext: ; 0x96f52
; pointer (PointerLabelBeforeBank)
; memory (SingleByteParam)
- call Function106c
+ call SetUpTextBox
call GetScriptByte
ld c, a
- callba Function11c000
+ callba StoreText
ret
; 0x96f60
@@ -559,8 +559,8 @@ Script_verbosegiveitem: ; 0x96f60
call Script_giveitem
call CurItemName
ld de, StringBuffer1
- ld a, $1
- call Function976c8
+ ld a, 1
+ call CopyConvertedText
ld b, BANK(GiveItemScript)
ld de, GiveItemScript
jp ScriptCall
@@ -600,26 +600,26 @@ Script_verbosegiveitem2: ; 0x96f8e
; var (SingleByteParam)
call GetScriptByte
- cp $ff
+ cp -1
jr nz, .ok
ld a, [ScriptVar]
.ok
ld [CurItem], a
call GetScriptByte
- call Function9769e
+ call GetVarAction
ld a, [de]
ld [wd10c], a
ld hl, NumItems
call ReceiveItem
- ld a, $1
+ ld a, 1
jr c, .ok2
xor a
.ok2
ld [ScriptVar], a
call CurItemName
ld de, StringBuffer1
- ld a, $1
- call Function976c8
+ ld a, 1
+ call CopyConvertedText
ld b, BANK(GiveItemScript)
ld de, GiveItemScript
jp ScriptCall
@@ -632,7 +632,7 @@ Script_itemnotify: ; 0x96fc6
call CurItemName
ld b, BANK(PutItemInPocketText)
ld hl, PutItemInPocketText
- call Function269a
+ call MapTextbox
ret
; 0x96fd5
@@ -643,7 +643,7 @@ Script_pocketisfull: ; 0x96fd5
call CurItemName
ld b, BANK(PocketIsFullText)
ld hl, PocketIsFullText
- call Function269a
+ call MapTextbox
ret
; 0x96fe4
@@ -746,7 +746,7 @@ Script_elevator: ; 0x9707c
ld d, a
ld a, [ScriptBank]
ld b, a
- callba Function1342d
+ callba Elevator
ret c
ld a, $1
ld [ScriptVar], a
@@ -775,14 +775,14 @@ Script_phonecall: ; 0x970a4
ld d, a
ld a, [ScriptBank]
ld b, a
- callba Function9029a
+ callba PhoneCall
ret
; 0x970b7
Script_hangup: ; 0x970b7
; script command 0x99
- callba Function902eb
+ callba HangUp
ret
; 0x970be
@@ -792,20 +792,20 @@ Script_askforphonenumber: ; 0x970be
; number (SingleByteParam)
call YesNoBox
- jr c, .asm_970d6 ; 0x970c1 $13
+ jr c, .refused ; 0x970c1 $13
call GetScriptByte
ld c, a
- callba Function90000
- jr c, .asm_970d2 ; 0x970cd $3
+ callba AddPhoneNumber
+ jr c, .phonefull ; 0x970cd $3
xor a
- jr .asm_970db ; 0x970d0 $9
-.asm_970d2
- ld a, $1
- jr .asm_970db ; 0x970d4 $5
-.asm_970d6
+ jr .done ; 0x970d0 $9
+.phonefull
+ ld a, 1
+ jr .done ; 0x970d4 $5
+.refused
call GetScriptByte
- ld a, $2
-.asm_970db
+ ld a, 2
+.done
ld [ScriptVar], a
ret
; 0x970df
@@ -817,7 +817,7 @@ Script_describedecoration: ; 0x970df
call GetScriptByte
ld b, a
- callba Function26f59
+ callba DescribeDecoration
ld h, d
ld l, e
jp ScriptJump
@@ -848,7 +848,7 @@ Script_loadwilddata: ; 0x970fc
ld d, a
call GetScriptByte
ld e, a
- callba Functionc403
+ callba LoadWildData
ret
; 0x9710f
@@ -859,7 +859,7 @@ Script_trainertext: ; 0x9710f
call GetScriptByte
ld c, a
- ld b, $0
+ ld b, 0
ld hl, WalkingX
add hl, bc
add hl, bc
@@ -868,7 +868,7 @@ Script_trainertext: ; 0x9710f
ld l, a
ld a, [EngineBuffer1]
ld b, a
- call Function269a
+ call MapTextbox
ret
; 0x97125
@@ -901,7 +901,7 @@ Script_trainerstatus: ; 0x97132
ld a, c
and a
ret z
- ld a, $1
+ ld a, 1
ld [ScriptVar], a
ret
; 0x9714c
@@ -937,7 +937,7 @@ Script_talkaftercancel: ; 0x97163
Script_talkaftercheck: ; 0x9716b
; script command 0x67
- ld a, $1
+ ld a, 1
ld [ScriptVar], a
ld a, [wd04d]
and a
@@ -1042,7 +1042,7 @@ Script_cry: ; 0x971d1
ret
; 0x971e3
-Function971e3: ; 0x971e3
+GetScriptPerson: ; 0x971e3
and a
ret z
cp $fe
@@ -1057,7 +1057,7 @@ Script_setlasttalked: ; 0x971ea
; person (SingleByteParam)
call GetScriptByte
- call Function971e3
+ call GetScriptPerson
ld [$ffe0], a
ret
; 0x971f3
@@ -1069,17 +1069,17 @@ Script_applymovement: ; 0x971f3
; data (MovementPointerLabelParam)
call GetScriptByte
- call Function971e3
+ call GetScriptPerson
ld c, a
; 971fa
-Function971fa: ; 971fa
+ApplyMovement: ; 971fa
push bc
ld a, c
- callba Function585c
+ callba SetFlagsForMovement_1
pop bc
push bc
- call Function97221
+ call SetFlagsForMovement_2
pop bc
call GetScriptByte
ld l, a
@@ -1087,7 +1087,7 @@ Function971fa: ; 971fa
ld h, a
ld a, [ScriptBank]
ld b, a
- call Function26c7
+ call GetMovementData
ret c
ld a, SCRIPT_WAIT_MOVEMENT
ld [ScriptMode], a
@@ -1095,8 +1095,8 @@ Function971fa: ; 971fa
ret
; 0x97221
-Function97221: ; 0x97221
- callba Function5897
+SetFlagsForMovement_2: ; 0x97221
+ callba _SetFlagsForMovement_2
ret
; 0x97228
@@ -1107,7 +1107,7 @@ Script_applymovement2: ; 0x97228
ld a, [$ffe0]
ld c, a
- jp Function971fa
+ jp ApplyMovement
; 0x9722e
Script_faceplayer: ; 0x9722e
@@ -1119,14 +1119,14 @@ Script_faceplayer: ; 0x9722e
ld d, $0
ld a, [$ffe0]
ld e, a
- callba Function8417
+ callba GetRelativeFacing
ld a, d
add a
add a
ld e, a
ld a, [$ffe0]
ld d, a
- call Function9728b
+ call ApplyPersonFacing
ret
; 0x97248
@@ -1137,21 +1137,21 @@ Script_faceperson: ; 0x97248
; person2 (SingleByteParam)
call GetScriptByte
- call Function971e3
+ call GetScriptPerson
cp $fe
jr c, .asm_97254 ; 0x97250 $2
ld a, [$ffe0]
.asm_97254
ld e, a
call GetScriptByte
- call Function971e3
+ call GetScriptPerson
cp $fe
jr nz, .asm_97261 ; 0x9725d $2
ld a, [$ffe0]
.asm_97261
ld d, a
push de
- callba Function8417
+ callba GetRelativeFacing
pop bc
ret c
ld a, d
@@ -1159,7 +1159,7 @@ Script_faceperson: ; 0x97248
add a
ld e, a
ld d, c
- call Function9728b
+ call ApplyPersonFacing
ret
; 0x97274
@@ -1170,7 +1170,7 @@ Script_spriteface: ; 0x97274
; facing (SingleByteParam)
call GetScriptByte
- call Function971e3
+ call GetScriptPerson
cp $fe
jr nz, .asm_97280 ; 0x9727c $2
ld a, [$ffe0]
@@ -1180,37 +1180,37 @@ Script_spriteface: ; 0x97274
add a
add a
ld e, a
- call Function9728b
+ call ApplyPersonFacing
ret
; 0x9728b
-Function9728b: ; 0x9728b
+ApplyPersonFacing: ; 0x9728b
ld a, d
push de
call Function18de
- jr c, .asm_972b9 ; 0x97290 $27
- ld hl, $0000
+ jr c, .not_visible ; 0x97290 $27
+ ld hl, OBJECT_SPRITE
add hl, bc
ld a, [hl]
push bc
call Function1836
pop bc
- jr c, .asm_972b9 ; 0x9729c $1b
- ld hl, $0004
+ jr c, .not_visible ; 0x9729c $1b
+ ld hl, OBJECT_04
add hl, bc
bit 2, [hl]
- jr nz, .asm_972b9 ; 0x972a4 $13
+ jr nz, .not_visible ; 0x972a4 $13
pop de
ld a, e
- call Function1af8
+ call SetSpriteDirection
ld hl, VramState
bit 6, [hl]
jr nz, .asm_972b5 ; 0x972b0 $3
call Function972bc
.asm_972b5
- call Function1ad2
+ call DrawOnMap
ret
-.asm_972b9
+.not_visible
pop de
scf
ret
@@ -1252,7 +1252,7 @@ Script_appear: ; 0x972dd
; person (SingleByteParam)
call GetScriptByte
- call Function971e3
+ call GetScriptPerson
call Function1956
ld a, [$ffaf]
ld b, $0
@@ -1266,7 +1266,7 @@ Script_disappear: ; 0x972ee
; person (SingleByteParam)
call GetScriptByte
- call Function971e3
+ call GetScriptPerson
cp $fe
jr nz, .asm_972fa ; 0x972f6 $2
ld a, [$ffe0]
@@ -1307,10 +1307,10 @@ Script_follow: ; 0x97325
; person1 (SingleByteParam)
call GetScriptByte
- call Function971e3
+ call GetScriptPerson
ld b, a
call GetScriptByte
- call Function971e3
+ call GetScriptPerson
ld c, a
callba Function5803
ret
@@ -1331,7 +1331,7 @@ Script_moveperson: ; 0x97341
; y (SingleByteParam)
call GetScriptByte
- call Function971e3
+ call GetScriptPerson
ld b, a
call GetScriptByte
add $4
@@ -1349,7 +1349,7 @@ Script_writepersonxy: ; 0x9735b
; person (SingleByteParam)
call GetScriptByte
- call Function971e3
+ call GetScriptPerson
cp $fe
jr nz, .asm_97367 ; 0x97363 $2
ld a, [$ffe0]
@@ -1366,10 +1366,10 @@ Script_follownotexact: ; 0x9736f
; person1 (SingleByteParam)
call GetScriptByte
- call Function971e3
+ call GetScriptPerson
ld b, a
call GetScriptByte
- call Function971e3
+ call GetScriptPerson
ld c, a
callba Function839e
ret
@@ -1400,7 +1400,7 @@ Script_showemote: ; 0x97396
call GetScriptByte
ld [ScriptVar], a
call GetScriptByte
- call Function971e3
+ call GetScriptPerson
cp $fe
jr z, .asm_973a8 ; 0x973a4 $2
ld [$ffe0], a
@@ -1525,7 +1525,7 @@ Script_loadtrainer: ; 0x97424
Script_startbattle: ; 0x97436
; script command 0x5f
- call Function2879
+ call BufferScreen
predef StartBattle
ld a, [wd0ee]
and $3f
@@ -1540,7 +1540,7 @@ Script_catchtutorial: ; 0x97447
call GetScriptByte
ld [BattleType], a
- call Function2879
+ call BufferScreen
callba Function4e554
jp Script_reloadmap
; 0x97459
@@ -1582,7 +1582,7 @@ Script_reloadmap: ; 0x97491
ld a, $f3
ld [$ff9f], a
ld a, $1
- call Function261b
+ call LoadMapStatus
call StopScript
ret
; 0x974a2
@@ -1858,7 +1858,7 @@ Script_priorityjump: ; 0x975aa
Script_checktriggers: ; 0x975c2
; script command 0x13
- call Function211b
+ call CheckTriggers
jr z, .asm_975cb ; 0x975c5 $4
ld [ScriptVar], a
ret
@@ -2051,7 +2051,7 @@ Script_checkcode: ; 0x9767d
; variable_id (SingleByteParam)
call GetScriptByte
- call Function9769e
+ call GetVarAction
ld a, [de]
ld [ScriptVar], a
ret
@@ -2063,7 +2063,7 @@ Script_writevarcode: ; 0x97688
; variable_id (SingleByteParam)
call GetScriptByte
- call Function9769e
+ call GetVarAction
ld a, [ScriptVar]
ld [de], a
ret
@@ -2076,15 +2076,15 @@ Script_writecode: ; 0x97693
; value (SingleByteParam)
call GetScriptByte
- call Function9769e
+ call GetVarAction
call GetScriptByte
ld [de], a
ret
; 0x9769e
-Function9769e: ; 0x9769e
+GetVarAction: ; 0x9769e
ld c, a
- callba Function80648
+ callba _GetVarAction
ret
; 0x976a6
@@ -2103,26 +2103,26 @@ Version: ; 976ad
Script_pokenamemem: ; 0x976ae
; script command 0x40
; parameters:
-; pokemon (PokemonParam)
+; pokemon (PokemonParam); leave $0 to draw from script var
; memory (SingleByteParam)
call GetScriptByte
and a
- jr nz, .asm_976b7 ; 0x976b2 $3
+ jr nz, .gotit ; 0x976b2 $3
ld a, [ScriptVar]
-.asm_976b7
+.gotit
ld [wd265], a
call GetPokemonName
ld de, StringBuffer1
-Unknown_976c0: ; 0x976c0
+ConvertMemToText: ; 0x976c0
call GetScriptByte
cp 3
jr c, .ok
xor a
.ok
-Function976c8: ; 976c8
+CopyConvertedText: ; 976c8
ld hl, StringBuffer3
ld bc, 19
call AddNTimes
@@ -2138,13 +2138,13 @@ Script_itemtotext: ; 0x976d5
call GetScriptByte
and a
- jr nz, .asm_976de ; 0x976d9 $3
+ jr nz, .ok ; 0x976d9 $3
ld a, [ScriptVar]
-.asm_976de
+.ok
ld [wd265], a
call GetItemName
ld de, StringBuffer1
- jr Unknown_976c0 ; 0x976e7 $d7
+ jr ConvertMemToText ; 0x976e7 $d7
; 0x976e9
Script_mapnametotext: ; 0x976e9
@@ -2158,11 +2158,11 @@ Script_mapnametotext: ; 0x976e9
ld c, a
call GetWorldMapLocation
-Unknown_976f4: ; 0x976f4
+ConvertLandmarkToText: ; 0x976f4
ld e, a
callba GetLandmarkName
ld de, StringBuffer1
- jp Unknown_976c0
+ jp ConvertMemToText
; 0x97701
Script_displaylocation: ; 0x97701
@@ -2172,7 +2172,7 @@ Script_displaylocation: ; 0x97701
; memory (SingleByteParam)
call GetScriptByte
- jr Unknown_976f4 ; 0x97704 $ee
+ jr ConvertLandmarkToText ; 0x97704 $ee
; 0x97706
Script_trainertotext: ; 0x97706
@@ -2186,8 +2186,8 @@ Script_trainertotext: ; 0x97706
ld c, a
call GetScriptByte
ld b, a
- callba Function3994c
- jr Unknown_976c0 ; 0x97714 $aa
+ callba GetTrainerName
+ jr ConvertMemToText ; 0x97714 $aa
; 0x97716
Script_name: ; 0x97716
@@ -2205,7 +2205,7 @@ Unknown_9771c: ; 0x9771c
ld [CurSpecies], a
call GetName
ld de, StringBuffer1
- jp Unknown_976c0
+ jp ConvertMemToText
; 0x9772b
Script_trainerclassname: ; 0x9772b
@@ -2225,13 +2225,13 @@ Script_readmoney: ; 0x97732
; account (SingleByteParam)
; memory (SingleByteParam)
- call Function97771
- call Function97861
+ call ResetStringBuffer1
+ call GetMoneyAccount
ld hl, StringBuffer1
ld bc, $4306
call PrintNum
ld de, StringBuffer1
- jp Unknown_976c0
+ jp ConvertMemToText
; 0x97747
Script_readcoins: ; 0x97747
@@ -2239,13 +2239,13 @@ Script_readcoins: ; 0x97747
; parameters:
; memory (SingleByteParam)
- call Function97771
+ call ResetStringBuffer1
ld hl, StringBuffer1
ld de, Coins
ld bc, $4206
call PrintNum
ld de, StringBuffer1
- jp Unknown_976c0
+ jp ConvertMemToText
; 0x9775c
Script_RAM2MEM: ; 0x9775c
@@ -2253,18 +2253,18 @@ Script_RAM2MEM: ; 0x9775c
; parameters:
; memory (SingleByteParam)
- call Function97771
+ call ResetStringBuffer1
ld de, ScriptVar
ld hl, StringBuffer1
ld bc, $4103
call PrintNum
ld de, StringBuffer1
- jp Unknown_976c0
+ jp ConvertMemToText
; 0x97771
-Function97771: ; 0x97771
+ResetStringBuffer1: ; 0x97771
ld hl, StringBuffer1
- ld bc, $000b
+ ld bc, NAME_LENGTH
ld a, "@"
call ByteFill
ret
@@ -2284,7 +2284,7 @@ Script_stringtotext: ; 0x9777d
ld hl, CopyName1
rst FarCall
ld de, StringBuffer2
- jp Unknown_976c0
+ jp ConvertMemToText
; 0x97792
Script_givepokeitem: ; 0x97792
@@ -2301,12 +2301,12 @@ Script_givepokeitem: ; 0x97792
ld b, a
push bc
inc hl
- ld bc, $0020
+ ld bc, MAIL_MAX_LENGTH
ld de, wd002
ld a, [ScriptBank]
call FarCopyBytes
pop bc
- callba Function446cc
+ callba GivePokeItem
ret
; 0x977b7
@@ -2332,20 +2332,20 @@ Script_giveitem: ; 0x977ca
; quantity (SingleByteParam)
call GetScriptByte
- cp $ff
- jr nz, .asm_977d4 ; 0x977cf $3
+ cp -1
+ jr nz, .ok ; 0x977cf $3
ld a, [ScriptVar]
-.asm_977d4
+.ok
ld [CurItem], a
call GetScriptByte
ld [wd10c], a
ld hl, NumItems
call ReceiveItem
- jr nc, .asm_977eb ; 0x977e3 $6
+ jr nc, .full ; 0x977e3 $6
ld a, $1
ld [ScriptVar], a
ret
-.asm_977eb
+.full
xor a
ld [ScriptVar], a
ret
@@ -2396,9 +2396,9 @@ Script_givemoney: ; 0x97829
; account (SingleByteParam)
; money (MoneyByteParam)
- call Function97861
- call Function9786d
- callba Function15fd7
+ call GetMoneyAccount
+ call LoadMoneyAmountToMem
+ callba GiveMoney
ret
; 0x97836
@@ -2408,9 +2408,9 @@ Script_takemoney: ; 0x97836
; account (SingleByteParam)
; money (MoneyByteParam)
- call Function97861
- call Function9786d
- callba Function15ffa
+ call GetMoneyAccount
+ call LoadMoneyAmountToMem
+ callba TakeMoney
ret
; 0x97843
@@ -2420,12 +2420,12 @@ Script_checkmoney: ; 0x97843
; account (SingleByteParam)
; money (MoneyByteParam)
- call Function97861
- call Function9786d
- callba Function1600b
+ call GetMoneyAccount
+ call LoadMoneyAmountToMem
+ callba CheckMoney
; 0x9784f
-Unknown_9784f: ; 0x9784f
+CheckMoneyAction: ; 0x9784f
jr c, .two
jr z, .one
ld a, 0
@@ -2440,7 +2440,7 @@ Unknown_9784f: ; 0x9784f
ret
; 0x97861
-Function97861: ; 0x97861
+GetMoneyAccount: ; 0x97861
call GetScriptByte
and a
ld de, Money
@@ -2449,7 +2449,7 @@ Function97861: ; 0x97861
ret
; 0x9786d
-Function9786d: ; 0x9786d
+LoadMoneyAmountToMem: ; 0x9786d
ld bc, $ffc3
push bc
call GetScriptByte
@@ -2469,8 +2469,8 @@ Script_givecoins: ; 0x97881
; parameters:
; coins (CoinByteParam)
- call Function978a0
- callba Function1606f
+ call LoadCoinAmountToMem
+ callba GiveCoins
ret
; 0x9788b
@@ -2479,8 +2479,8 @@ Script_takecoins: ; 0x9788b
; parameters:
; coins (CoinByteParam)
- call Function978a0
- callba Function1608f
+ call LoadCoinAmountToMem
+ callba TakeCoins
ret
; 0x97895
@@ -2489,12 +2489,12 @@ Script_checkcoins: ; 0x97895
; parameters:
; coins (CoinByteParam)
- call Function978a0
- callba Function160a1
- jr Unknown_9784f
+ call LoadCoinAmountToMem
+ callba CheckCoins
+ jr CheckMoneyAction
; 978a0
-Function978a0: ; 978a0
+LoadCoinAmountToMem: ; 978a0
call GetScriptByte
ld [$ffc4], a
call GetScriptByte
@@ -2510,7 +2510,7 @@ Script_checktime: ; 0x978ae
xor a
ld [ScriptVar], a
- callba Functionc000
+ callba CheckTime
call GetScriptByte
and c
ret z
@@ -2545,7 +2545,7 @@ Script_addcellnum: ; 0x978da
ld [ScriptVar], a
call GetScriptByte
ld c, a
- callba Function90000
+ callba AddPhoneNumber
ret nc
ld a, $1
ld [ScriptVar], a
@@ -2561,7 +2561,7 @@ Script_delcellnum: ; 0x978ef
ld [ScriptVar], a
call GetScriptByte
ld c, a
- callba Function9000f
+ callba DelCellNum
ret nc
ld a, $1
ld [ScriptVar], a
@@ -2577,7 +2577,7 @@ Script_checkcellnum: ; 0x97904
ld [ScriptVar], a
call GetScriptByte
ld c, a
- callba Function90019
+ callba CheckCellNum
ret nc
ld a, $1
ld [ScriptVar], a
@@ -2637,7 +2637,7 @@ Script_givepoke: ; 0x97932
call GetScriptByte
call GetScriptByte
.ok
- callba Functione277
+ callba GivePoke
ld a, b
ld [ScriptVar], a
ret
@@ -2721,7 +2721,7 @@ Script_setflag: ; 0x979bb
call GetScriptByte
ld d, a
ld b, $1
- call Function979ee
+ call _EngineFlagAction
ret
; 0x979c9
@@ -2735,7 +2735,7 @@ Script_clearflag: ; 0x979c9
call GetScriptByte
ld d, a
ld b, $0
- call Function979ee
+ call _EngineFlagAction
ret
; 0x979d7
@@ -2749,7 +2749,7 @@ Script_checkflag: ; 0x979d7
call GetScriptByte
ld d, a
ld b, $2
- call Function979ee
+ call _EngineFlagAction
ld a, c
and a
jr z, .asm_979ea ; 0x979e6 $2
@@ -2759,7 +2759,7 @@ Script_checkflag: ; 0x979d7
ret
; 0x979ee
-Function979ee: ; 0x979ee
+_EngineFlagAction: ; 0x979ee
callba EngineFlagAction
ret
; 0x979f5
@@ -2820,7 +2820,7 @@ Script_warp: ; 0x97a1d
call GetScriptByte
and a
- jr z, .asm_97a4a ; 0x97a21 $27
+ jr z, .not_ok ; 0x97a21 $27
ld [MapGroup], a
call GetScriptByte
ld [MapNumber], a
@@ -2833,10 +2833,10 @@ Script_warp: ; 0x97a1d
ld a, $f1
ld [$ff9f], a
ld a, $1
- call Function261b
+ call LoadMapStatus
call StopScript
ret
-.asm_97a4a
+.not_ok
call GetScriptByte
call GetScriptByte
call GetScriptByte
@@ -2845,7 +2845,7 @@ Script_warp: ; 0x97a1d
ld a, $fb
ld [$ff9f], a
ld a, $1
- call Function261b
+ call LoadMapStatus
call StopScript
ret
; 0x97a65
@@ -2929,8 +2929,8 @@ Script_changemap: ; 0x97ab3
ld [MapBlockDataPointer], a
call GetScriptByte
ld [MapBlockDataPointer + 1], a
- call Function24e4
- call Function2879
+ call ChangeMap
+ call BufferScreen
ret
; 0x97acc
@@ -2947,10 +2947,10 @@ Script_changeblock: ; 0x97acc
call GetScriptByte
add $4
ld e, a
- call Function2a66
+ call GetBlockLocation
call GetScriptByte
ld [hl], a
- call Function2879
+ call BufferScreen
ret
; 0x97ae3
@@ -2962,7 +2962,7 @@ Script_reloadmappart:: ; 0x97ae3
call Function2173
call Function2914
callba Function104061
- call Function1ad2
+ call DrawOnMap
ret
; 0x97af6
@@ -2971,12 +2971,12 @@ Script_warpcheck: ; 0x97af6
call Function224a
ret nc
- callba Function966d0
+ callba SetAll_ScriptFlags3
ret
; 0x97b01
Function97b01: ; 0x97b01
- callba Function966d0
+ callba SetAll_ScriptFlags3
ret
; 0x97b08
@@ -2988,7 +2988,7 @@ Script_newloadmap: ; 0x97b08
call GetScriptByte
ld [$ff9f], a
ld a, $1
- call Function261b
+ call LoadMapStatus
call StopScript
ret
; 0x97b16
@@ -3196,7 +3196,7 @@ Script_credits: ; 0x97bf3
DisplayCredits:
call Script_resetfuncs
ld a, $3
- call Function261b
+ call LoadMapStatus
call StopScript
ret
; 0x97c051
diff --git a/engine/spawn_points.asm b/engine/spawn_points.asm
index 874faabd7..dba86c582 100644
--- a/engine/spawn_points.asm
+++ b/engine/spawn_points.asm
@@ -41,22 +41,22 @@ ENDM
spawn BLACKTHORN, BLACKTHORN_CITY, 21, 30
spawn MT_SILVER, SILVER_CAVE_OUTSIDE, 23, 20
spawn FAST_SHIP, FAST_SHIP_CABINS_SW_SSW_NW, 6, 2
+const_value = -1
+ spawn N_A, N_A, -1, -1
- db -1, -1, -1, -1
-
- const NUM_SPAWNS
+NUM_SPAWNS EQU const_value
LoadSpawnPoint: ; 1531f
+ ; loads the spawn point in wd001
push hl
push de
ld a, [wd001]
- cp -1
- jr z, .asm_15341
+ cp SPAWN_N_A
+ jr z, .spawn_n_a
ld l, a
ld h, 0
- add hl, hl
- add hl, hl
+ add_n_times hl, hl, 2 ; multiply hl by 4
ld de, SpawnPoints
add hl, de
ld a, [hli]
@@ -67,7 +67,7 @@ LoadSpawnPoint: ; 1531f
ld [XCoord], a
ld a, [hli]
ld [YCoord], a
-.asm_15341
+.spawn_n_a
pop de
pop hl
ret
@@ -75,32 +75,33 @@ LoadSpawnPoint: ; 1531f
IsSpawnPoint: ; 15344
+; Checks if the map loaded in de is a spawn point. Returns carry if it's a spawn point.
ld hl, SpawnPoints
ld c, 0
-.asm_15349
+.loop
ld a, [hl]
- cp -1
- jr z, .asm_1535f
+ cp SPAWN_N_A
+ jr z, .nope
cp d
- jr nz, .asm_15356
+ jr nz, .next
inc hl
ld a, [hld]
cp e
- jr z, .asm_15361
+ jr z, .yes
-.asm_15356
+.next
push bc
ld bc, 4
add hl, bc
pop bc
inc c
- jr .asm_15349
+ jr .loop
-.asm_1535f
+.nope
and a
ret
-.asm_15361
+.yes
scf
ret
; 15363
diff --git a/engine/specials.asm b/engine/specials.asm
index 35af3160d..949cf8b1b 100644
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -36,10 +36,10 @@ SpecialsPointers:: ; c029
add_special Functionc2f6
add_special Functionc309
add_special Function1050b9
- add_special Functionc34a
- add_special Function4d9e5
+ add_special BugContestJudging
+ add_special CheckPartyFullAfterContest
add_special Function13a12
- add_special Function13a31
+ add_special ContestReturnMons
add_special Function135db
add_special Functionfbb32
add_special Functionfbcd2
@@ -71,7 +71,7 @@ SpecialsPointers:: ; c029
add_special WhiteBGMap
add_special UpdateTimePals
add_special ClearTileMap
- add_special Function1ad2
+ add_special DrawOnMap
add_special Functione4a
add_special Functionc230
add_special SpecialSeenMon
@@ -105,7 +105,7 @@ SpecialsPointers:: ; c029
add_special Function88018
add_special SpecialNameRater
add_special Functionc2da
- add_special Function718d
+ add_special GetFirstPokemonHappiness
add_special Function71ac
add_special Function2a4ab
add_special Function2a51f
@@ -173,7 +173,7 @@ SpecialsPointers:: ; c029
add_special Function10366e
add_special Function1037eb
add_special Function10383c
- add_special Function1060a2
+ add_special Mobile_HealParty
add_special Function14168
add_special Function1037c2
add_special Function10630f
@@ -358,8 +358,8 @@ UnknownText_0xc345: ; 0xc345
db "@"
; 0xc34a
-Functionc34a: ; c34a
- callba Function1369d
+BugContestJudging: ; c34a
+ callba _BugContestJudging
ld a, b
ld [ScriptVar], a
ret
@@ -463,7 +463,7 @@ UnknownText_0xc3d6: ; 0xc3d6
Functionc3db: ; c3db
call WhiteBGMap
- call Function2879
+ call BufferScreen
ret
; c3e2
@@ -492,17 +492,18 @@ Functionc3fc: ; c3fc
; c403
-Functionc403:: ; c403
+LoadWildData:: ; c403
ld a, c
and a
- jr nz, .asm_c410
+ jr nz, .swarm_route35
+; swarm dark cave violet entrance
ld a, d
ld [wdfcc], a
ld a, e
ld [wdfcd], a
ret
-.asm_c410
+.swarm_route35
ld a, d
ld [wdc5a], a
ld a, e
diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm
index 4315a07f1..885bde7e9 100644
--- a/engine/std_scripts.asm
+++ b/engine/std_scripts.asm
@@ -46,10 +46,10 @@ StdScripts::
dbw BANK(RematchGiftFScript), RematchGiftFScript
dbw BANK(GymStatue1Script), GymStatue1Script
dbw BANK(GymStatue2Script), GymStatue2Script
- dbw BANK(UnknownScript_0xbcdb9), UnknownScript_0xbcdb9
- dbw BANK(UnknownScript_0xbcdc3), UnknownScript_0xbcdc3
+ dbw BANK(ReceiveItemScript), ReceiveItemScript
+ dbw BANK(ReceiveTogepiEggScript), ReceiveTogepiEggScript
dbw BANK(PCScript), PCScript
- dbw BANK(UnknownScript_0xbcdcd), UnknownScript_0xbcdcd
+ dbw BANK(GameCornerCoinVendorScript), GameCornerCoinVendorScript
dbw BANK(HappinessCheckScript), HappinessCheckScript
PokeCenterNurseScript:
@@ -107,12 +107,12 @@ PokeCenterNurseScript:
farwritetext UnknownText_0x1b01bd
pause 20
- special Function1060a2
+ special Mobile_HealParty
spriteface $fe, LEFT
pause 10
special HealParty
playmusic MUSIC_NONE
- writebyte 0
+ writebyte 0 ; Machine is at a Pokemon Center
special HealMachineAnim
pause 30
special RestartMapMusic
@@ -303,57 +303,57 @@ RadioTowerRocketsScript:
BugContestResultsWarpScript:
special WhiteBGMap
- scall UnknownScript_0xbc380
+ scall BugContestResults_EnsureNoDuplicateSprites
setevent EVENT_747
clearevent EVENT_748
setevent EVENT_2D2
warp GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE, $0, $4
- applymovement $0, MovementData_0xbcea1
+ applymovement $0, Movement_ContestResults_WalkAfterWarp
BugContestResultsScript:
clearflag ENGINE_BUG_CONTEST_TIMER
clearevent EVENT_2D2
- clearevent EVENT_313
- clearevent EVENT_314
- clearevent EVENT_315
- clearevent EVENT_316
+ clearevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
+ clearevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
+ clearevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
+ clearevent EVENT_CONTEST_OFFICER_HAS_BERRY
loadfont
- farwritetext UnknownText_0x1b05bf
+ farwritetext ContestResults_ReadyToJudgeText
closetext
- special Functionc34a
+ special BugContestJudging
RAM2MEM $0
- if_equal $1, UnknownScript_0xbc31e
- if_equal $2, UnknownScript_0xbc332
- if_equal $3, UnknownScript_0xbc343
- farwritetext UnknownText_0x1b0681
+ if_equal 1, BugContestResults_FirstPlace
+ if_equal 2, BugContestResults_SecondPlace
+ if_equal 3, BugContestResults_ThirdPlace
+ farwritetext ContestResults_ConsolationPrizeText
keeptextopen
waitbutton
verbosegiveitem BERRY, 1
- iffalse UnknownScript_0xbc375
+ iffalse BugContestResults_NoRoomForBerry
-UnknownScript_0xbc2a9:
- farwritetext UnknownText_0x1b06b7
+BugContestResults_DidNotWin
+ farwritetext ContestResults_DidNotWinText
keeptextopen
- jump UnknownScript_0xbc2b6
+ jump BugContestResults_FinishUp
; 0xbc2b1
-UnknownScript_0xbc2b1: ; 0xbc2b1
- farwritetext UnknownText_0x1b065b
+BugContestResults_ReturnAfterWinnersPrize ; 0xbc2b1
+ farwritetext ContestResults_JoinUsNextTimeText
keeptextopen
-UnknownScript_0xbc2b6:
- checkevent EVENT_308
- iffalse UnknownScript_0xbc2c4
- farwritetext UnknownText_0x1b06d9
+BugContestResults_FinishUp
+ checkevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
+ iffalse BugContestResults_DidNotLeaveMons
+ farwritetext ContestResults_ReturnPartyText
closetext
- special Function13a31
-UnknownScript_0xbc2c4:
- special Function4d9e5
- if_equal $0, UnknownScript_0xbc2d4
- if_equal $2, UnknownScript_0xbc2d4
- farwritetext UnknownText_0x1b070d
+ special ContestReturnMons
+BugContestResults_DidNotLeaveMons
+ special CheckPartyFullAfterContest
+ if_equal $0, BugContestResults_CleanUp
+ if_equal $2, BugContestResults_CleanUp
+ farwritetext ContestResults_PartyFullText
closetext
-UnknownScript_0xbc2d4:
+BugContestResults_CleanUp
loadmovesprites
dotrigger $0
domaptrigger GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE, $0
@@ -377,68 +377,68 @@ UnknownScript_0xbc2d4:
setevent EVENT_727
setevent EVENT_728
setevent EVENT_729
- setflag ENGINE_51
+ setflag ENGINE_DAILY_BUG_CONTEST
special PlayMapMusic
end
; 0xbc31e
-UnknownScript_0xbc31e: ; 0xbc31e
+BugContestResults_FirstPlace ; 0xbc31e
setevent EVENT_000
itemtotext SUN_STONE, $1
- farwritetext UnknownText_0x1b0621
+ farwritetext ContestResults_PlayerWonAPrizeText
closetext
verbosegiveitem SUN_STONE, 1
- iffalse UnknownScript_0xbc354
- jump UnknownScript_0xbc2b1
+ iffalse BugContestResults_NoRoomForSunStone
+ jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc332
-UnknownScript_0xbc332: ; 0xbc332
+BugContestResults_SecondPlace ; 0xbc332
itemtotext EVERSTONE, $1
- farwritetext UnknownText_0x1b0621
+ farwritetext ContestResults_PlayerWonAPrizeText
closetext
verbosegiveitem EVERSTONE, 1
- iffalse UnknownScript_0xbc35f
- jump UnknownScript_0xbc2b1
+ iffalse BugContestResults_NoRoomForEverstone
+ jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc343
-UnknownScript_0xbc343: ; 0xbc343
+BugContestResults_ThirdPlace ; 0xbc343
itemtotext GOLD_BERRY, $1
- farwritetext UnknownText_0x1b0621
+ farwritetext ContestResults_PlayerWonAPrizeText
closetext
verbosegiveitem GOLD_BERRY, 1
- iffalse UnknownScript_0xbc36a
- jump UnknownScript_0xbc2b1
+ iffalse BugContestResults_NoRoomForGoldBerry
+ jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc354
-UnknownScript_0xbc354: ; 0xbc354
+BugContestResults_NoRoomForSunStone ; 0xbc354
farwritetext UnknownText_0x1b08cc
keeptextopen
- setevent EVENT_313
- jump UnknownScript_0xbc2b1
+ setevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
+ jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc35f
-UnknownScript_0xbc35f: ; 0xbc35f
+BugContestResults_NoRoomForEverstone ; 0xbc35f
farwritetext UnknownText_0x1b08cc
keeptextopen
- setevent EVENT_314
- jump UnknownScript_0xbc2b1
+ setevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
+ jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc36a
-UnknownScript_0xbc36a: ; 0xbc36a
+BugContestResults_NoRoomForGoldBerry ; 0xbc36a
farwritetext UnknownText_0x1b08cc
keeptextopen
- setevent EVENT_315
- jump UnknownScript_0xbc2b1
+ setevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
+ jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc375
-UnknownScript_0xbc375: ; 0xbc375
+BugContestResults_NoRoomForBerry ; 0xbc375
farwritetext UnknownText_0x1b08cc
keeptextopen
- setevent EVENT_316
- jump UnknownScript_0xbc2a9
+ setevent EVENT_CONTEST_OFFICER_HAS_BERRY
+ jump BugContestResults_DidNotWin
; 0xbc380
-UnknownScript_0xbc380: ; 0xbc380
+BugContestResults_EnsureNoDuplicateSprites ; 0xbc380
checkevent EVENT_716
iftrue .skip1
clearevent EVENT_720
@@ -561,7 +561,7 @@ InitializeEventsScript:
setevent EVENT_731
setevent EVENT_74A
setevent EVENT_RED_IN_MT_SILVER
- setevent EVENT_738
+ setevent EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
setevent EVENT_73A
setevent EVENT_73B
setevent EVENT_733
@@ -623,26 +623,26 @@ InitializeEventsScript:
AskNumber1MScript:
special RandomPhoneMon
checkcode VAR_CALLERID
- if_equal $5, .Jack
- if_equal $7, .Huey
- if_equal $b, .Gaven
- if_equal $d, .Jose
- if_equal $f, .Joey
- if_equal $10, .Wade
- if_equal $11, .Ralph
- if_equal $13, .Anthony
- if_equal $14, .Todd
- if_equal $16, .Irwin
- if_equal $17, .Arnie
- if_equal $18, .Alan
- if_equal $1b, .Chad
- if_equal $1c, .Derek
- if_equal $1d, .Tully
- if_equal $1e, .Brent
- if_equal $20, .Vance
- if_equal $21, .Wilton
- if_equal $22, .Kenji
- if_equal $23, .Parry
+ if_equal PHONE_SCHOOLBOY_JACK, .Jack
+ if_equal PHONE_SAILOR_HUEY, .Huey
+ if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
+ if_equal PHONE_BIRDKEEPER_JOSE, .Jose
+ if_equal PHONE_YOUNGSTER_JOEY, .Joey
+ if_equal PHONE_BUG_CATCHER_WADE, .Wade
+ if_equal PHONE_FISHER_RALPH, .Ralph
+ if_equal PHONE_HIKER_ANTHONY, .Anthony
+ if_equal PHONE_CAMPER_TODD, .Todd
+ if_equal PHONE_JUGGLER_IRWIN, .Irwin
+ if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
+ if_equal PHONE_SCHOOLBOY_ALAN, .Alan
+ if_equal PHONE_SCHOOLBOY_CHAD, .Chad
+ if_equal PHONE_POKEFANM_DEREK, .Derek
+ if_equal PHONE_FISHER_TULLY, .Tully
+ if_equal PHONE_POKEMANIAC_BRENT, .Brent
+ if_equal PHONE_BIRDKEEPER_VANCE, .Vance
+ if_equal PHONE_FISHER_WILTON, .Wilton
+ if_equal PHONE_BLACKBELT_KENJI, .Kenji
+ if_equal PHONE_HIKER_PARRY, .Parry
.Jack
farwritetext JackAskNumber1Text
@@ -708,26 +708,26 @@ AskNumber1MScript:
AskNumber2MScript:
special RandomPhoneMon
checkcode VAR_CALLERID
- if_equal $5, .Jack
- if_equal $7, .Huey
- if_equal $b, .Gaven
- if_equal $d, .Jose
- if_equal $f, .Joey
- if_equal $10, .Wade
- if_equal $11, .Ralph
- if_equal $13, .Anthony
- if_equal $14, .Todd
- if_equal $16, .Irwin
- if_equal $17, .Arnie
- if_equal $18, .Alan
- if_equal $1b, .Chad
- if_equal $1c, .Derek
- if_equal $1d, .Tully
- if_equal $1e, .Brent
- if_equal $20, .Vance
- if_equal $21, .Wilton
- if_equal $22, .Kenji
- if_equal $23, .Parry
+ if_equal PHONE_SCHOOLBOY_JACK, .Jack
+ if_equal PHONE_SAILOR_HUEY, .Huey
+ if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
+ if_equal PHONE_BIRDKEEPER_JOSE, .Jose
+ if_equal PHONE_YOUNGSTER_JOEY, .Joey
+ if_equal PHONE_BUG_CATCHER_WADE, .Wade
+ if_equal PHONE_FISHER_RALPH, .Ralph
+ if_equal PHONE_HIKER_ANTHONY, .Anthony
+ if_equal PHONE_CAMPER_TODD, .Todd
+ if_equal PHONE_JUGGLER_IRWIN, .Irwin
+ if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
+ if_equal PHONE_SCHOOLBOY_ALAN, .Alan
+ if_equal PHONE_SCHOOLBOY_CHAD, .Chad
+ if_equal PHONE_POKEFANM_DEREK, .Derek
+ if_equal PHONE_FISHER_TULLY, .Tully
+ if_equal PHONE_POKEMANIAC_BRENT, .Brent
+ if_equal PHONE_BIRDKEEPER_VANCE, .Vance
+ if_equal PHONE_FISHER_WILTON, .Wilton
+ if_equal PHONE_BLACKBELT_KENJI, .Kenji
+ if_equal PHONE_HIKER_PARRY, .Parry
.Jack
farwritetext JackAskNumber2Text
@@ -799,26 +799,26 @@ RegisteredNumberMScript:
NumberAcceptedMScript:
checkcode VAR_CALLERID
- if_equal $5, .Jack
- if_equal $7, .Huey
- if_equal $b, .Gaven
- if_equal $d, .Jose
- if_equal $f, .Joey
- if_equal $10, .Wade
- if_equal $11, .Ralph
- if_equal $13, .Anthony
- if_equal $14, .Todd
- if_equal $16, .Irwin
- if_equal $17, .Arnie
- if_equal $18, .Alan
- if_equal $1b, .Chad
- if_equal $1c, .Derek
- if_equal $1d, .Tully
- if_equal $1e, .Brent
- if_equal $20, .Vance
- if_equal $21, .Wilton
- if_equal $22, .Kenji
- if_equal $23, .Parry
+ if_equal PHONE_SCHOOLBOY_JACK, .Jack
+ if_equal PHONE_SAILOR_HUEY, .Huey
+ if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
+ if_equal PHONE_BIRDKEEPER_JOSE, .Jose
+ if_equal PHONE_YOUNGSTER_JOEY, .Joey
+ if_equal PHONE_BUG_CATCHER_WADE, .Wade
+ if_equal PHONE_FISHER_RALPH, .Ralph
+ if_equal PHONE_HIKER_ANTHONY, .Anthony
+ if_equal PHONE_CAMPER_TODD, .Todd
+ if_equal PHONE_JUGGLER_IRWIN, .Irwin
+ if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
+ if_equal PHONE_SCHOOLBOY_ALAN, .Alan
+ if_equal PHONE_SCHOOLBOY_CHAD, .Chad
+ if_equal PHONE_POKEFANM_DEREK, .Derek
+ if_equal PHONE_FISHER_TULLY, .Tully
+ if_equal PHONE_POKEMANIAC_BRENT, .Brent
+ if_equal PHONE_BIRDKEEPER_VANCE, .Vance
+ if_equal PHONE_FISHER_WILTON, .Wilton
+ if_equal PHONE_BLACKBELT_KENJI, .Kenji
+ if_equal PHONE_HIKER_PARRY, .Parry
.Jack
farwritetext JackNumberAcceptedText
@@ -923,26 +923,26 @@ NumberAcceptedMScript:
NumberDeclinedMScript:
checkcode VAR_CALLERID
- if_equal $5, .Jack
- if_equal $7, .Huey
- if_equal $b, .Gaven
- if_equal $d, .Jose
- if_equal $f, .Joey
- if_equal $10, .Wade
- if_equal $11, .Ralph
- if_equal $13, .Anthony
- if_equal $14, .Todd
- if_equal $16, .Irwin
- if_equal $17, .Arnie
- if_equal $18, .Alan
- if_equal $1b, .Chad
- if_equal $1c, .Derek
- if_equal $1d, .Tully
- if_equal $1e, .Brent
- if_equal $20, .Vance
- if_equal $21, .Wilton
- if_equal $22, .Kenji
- if_equal $23, .Parry
+ if_equal PHONE_SCHOOLBOY_JACK, .Jack
+ if_equal PHONE_SAILOR_HUEY, .Huey
+ if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
+ if_equal PHONE_BIRDKEEPER_JOSE, .Jose
+ if_equal PHONE_YOUNGSTER_JOEY, .Joey
+ if_equal PHONE_BUG_CATCHER_WADE, .Wade
+ if_equal PHONE_FISHER_RALPH, .Ralph
+ if_equal PHONE_HIKER_ANTHONY, .Anthony
+ if_equal PHONE_CAMPER_TODD, .Todd
+ if_equal PHONE_JUGGLER_IRWIN, .Irwin
+ if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
+ if_equal PHONE_SCHOOLBOY_ALAN, .Alan
+ if_equal PHONE_SCHOOLBOY_CHAD, .Chad
+ if_equal PHONE_POKEFANM_DEREK, .Derek
+ if_equal PHONE_FISHER_TULLY, .Tully
+ if_equal PHONE_POKEMANIAC_BRENT, .Brent
+ if_equal PHONE_BIRDKEEPER_VANCE, .Vance
+ if_equal PHONE_FISHER_WILTON, .Wilton
+ if_equal PHONE_BLACKBELT_KENJI, .Kenji
+ if_equal PHONE_HIKER_PARRY, .Parry
.Jack
farwritetext JackNumberDeclinedText
@@ -1047,26 +1047,26 @@ NumberDeclinedMScript:
PhoneFullMScript:
checkcode VAR_CALLERID
- if_equal $5, .Jack
- if_equal $7, .Huey
- if_equal $b, .Gaven
- if_equal $d, .Jose
- if_equal $f, .Joey
- if_equal $10, .Wade
- if_equal $11, .Ralph
- if_equal $13, .Anthony
- if_equal $14, .Todd
- if_equal $16, .Irwin
- if_equal $17, .Arnie
- if_equal $18, .Alan
- if_equal $1b, .Chad
- if_equal $1c, .Derek
- if_equal $1d, .Tully
- if_equal $1e, .Brent
- if_equal $20, .Vance
- if_equal $21, .Wilton
- if_equal $22, .Kenji
- if_equal $23, .Parry
+ if_equal PHONE_SCHOOLBOY_JACK, .Jack
+ if_equal PHONE_SAILOR_HUEY, .Huey
+ if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
+ if_equal PHONE_BIRDKEEPER_JOSE, .Jose
+ if_equal PHONE_YOUNGSTER_JOEY, .Joey
+ if_equal PHONE_BUG_CATCHER_WADE, .Wade
+ if_equal PHONE_FISHER_RALPH, .Ralph
+ if_equal PHONE_HIKER_ANTHONY, .Anthony
+ if_equal PHONE_CAMPER_TODD, .Todd
+ if_equal PHONE_JUGGLER_IRWIN, .Irwin
+ if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
+ if_equal PHONE_SCHOOLBOY_ALAN, .Alan
+ if_equal PHONE_SCHOOLBOY_CHAD, .Chad
+ if_equal PHONE_POKEFANM_DEREK, .Derek
+ if_equal PHONE_FISHER_TULLY, .Tully
+ if_equal PHONE_POKEMANIAC_BRENT, .Brent
+ if_equal PHONE_BIRDKEEPER_VANCE, .Vance
+ if_equal PHONE_FISHER_WILTON, .Wilton
+ if_equal PHONE_BLACKBELT_KENJI, .Kenji
+ if_equal PHONE_HIKER_PARRY, .Parry
.Jack
farwritetext JackPhoneFullText
@@ -1171,23 +1171,23 @@ PhoneFullMScript:
RematchMScript:
checkcode VAR_CALLERID
- if_equal $5, .Jack
- if_equal $7, .Huey
- if_equal $b, .Gaven
- if_equal $d, .Jose
- if_equal $f, .Joey
- if_equal $10, .Wade
- if_equal $11, .Ralph
- if_equal $13, .Anthony
- if_equal $14, .Todd
- if_equal $17, .Arnie
- if_equal $18, .Alan
- if_equal $1b, .Chad
- if_equal $1d, .Tully
- if_equal $1e, .Brent
- if_equal $20, .Vance
- if_equal $21, .Wilton
- if_equal $23, .Parry
+ if_equal PHONE_SCHOOLBOY_JACK, .Jack
+ if_equal PHONE_SAILOR_HUEY, .Huey
+ if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
+ if_equal PHONE_BIRDKEEPER_JOSE, .Jose
+ if_equal PHONE_YOUNGSTER_JOEY, .Joey
+ if_equal PHONE_BUG_CATCHER_WADE, .Wade
+ if_equal PHONE_FISHER_RALPH, .Ralph
+ if_equal PHONE_HIKER_ANTHONY, .Anthony
+ if_equal PHONE_CAMPER_TODD, .Todd
+ if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
+ if_equal PHONE_SCHOOLBOY_ALAN, .Alan
+ if_equal PHONE_SCHOOLBOY_CHAD, .Chad
+ if_equal PHONE_FISHER_TULLY, .Tully
+ if_equal PHONE_POKEMANIAC_BRENT, .Brent
+ if_equal PHONE_BIRDKEEPER_VANCE, .Vance
+ if_equal PHONE_FISHER_WILTON, .Wilton
+ if_equal PHONE_HIKER_PARRY, .Parry
.Jack
farwritetext JackRematchText
@@ -1277,13 +1277,13 @@ RematchMScript:
GiftMScript:
checkcode VAR_CALLERID
- if_equal $d, .Jose
- if_equal $10, .Wade
- if_equal $18, .Alan
- if_equal $1c, .Derek
- if_equal $1d, .Tully
- if_equal $21, .Wilton
- if_equal $22, .Kenji
+ if_equal PHONE_BIRDKEEPER_JOSE, .Jose
+ if_equal PHONE_BUG_CATCHER_WADE, .Wade
+ if_equal PHONE_SCHOOLBOY_ALAN, .Alan
+ if_equal PHONE_POKEFANM_DEREK, .Derek
+ if_equal PHONE_FISHER_TULLY, .Tully
+ if_equal PHONE_FISHER_WILTON, .Wilton
+ if_equal PHONE_BLACKBELT_KENJI, .Kenji
.Jose
farwritetext JoseGiftText
@@ -1316,17 +1316,17 @@ GiftMScript:
PackFullMScript:
checkcode VAR_CALLERID
- if_equal $7, .Huey
- if_equal $d, .Jose
- if_equal $f, .Joey
- if_equal $10, .Wade
- if_equal $18, .Alan
- if_equal $1c, .Derek
- if_equal $1d, .Tully
- if_equal $20, .Vance
- if_equal $21, .Wilton
- if_equal $22, .Kenji
- if_equal $23, .Parry
+ if_equal PHONE_SAILOR_HUEY, .Huey
+ if_equal PHONE_BIRDKEEPER_JOSE, .Jose
+ if_equal PHONE_YOUNGSTER_JOEY, .Joey
+ if_equal PHONE_BUG_CATCHER_WADE, .Wade
+ if_equal PHONE_SCHOOLBOY_ALAN, .Alan
+ if_equal PHONE_POKEFANM_DEREK, .Derek
+ if_equal PHONE_FISHER_TULLY, .Tully
+ if_equal PHONE_BIRDKEEPER_VANCE, .Vance
+ if_equal PHONE_FISHER_WILTON, .Wilton
+ if_equal PHONE_BLACKBELT_KENJI, .Kenji
+ if_equal PHONE_HIKER_PARRY, .Parry
.Huey
farwritetext HueyPackFullText
@@ -1387,10 +1387,10 @@ PackFullMScript:
RematchGiftMScript:
loadfont
checkcode VAR_CALLERID
- if_equal $7, .Huey
- if_equal $f, .Joey
- if_equal $20, .Vance
- if_equal $23, .Parry
+ if_equal PHONE_SAILOR_HUEY, .Huey
+ if_equal PHONE_YOUNGSTER_JOEY, .Joey
+ if_equal PHONE_BIRDKEEPER_VANCE, .Vance
+ if_equal PHONE_HIKER_PARRY, .Parry
.Huey
farwritetext HueyRematchGiftText
@@ -1411,14 +1411,14 @@ RematchGiftMScript:
AskNumber1FScript:
checkcode VAR_CALLERID
- if_equal $6, .Beverly
- if_equal $c, .Beth
- if_equal $e, .Reena
- if_equal $12, .Liz
- if_equal $15, .Gina
- if_equal $1a, .Dana
- if_equal $1f, .Tiffany
- if_equal $24, .Erin
+ if_equal PHONE_POKEFAN_BEVERLY, .Beverly
+ if_equal PHONE_COOLTRAINERF_BETH, .Beth
+ if_equal PHONE_COOLTRAINERF_REENA, .Reena
+ if_equal PHONE_PICNICKER_LIZ, .Liz
+ if_equal PHONE_PICNICKER_GINA, .Gina
+ if_equal PHONE_LASS_DANA, .Dana
+ if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
+ if_equal PHONE_PICNICKER_ERIN, .Erin
.Beverly
farwritetext BeverlyAskNumber1Text
@@ -1447,14 +1447,14 @@ AskNumber1FScript:
AskNumber2FScript:
checkcode VAR_CALLERID
- if_equal $6, .Beverly
- if_equal $c, .Beth
- if_equal $e, .Reena
- if_equal $12, .Liz
- if_equal $15, .Gina
- if_equal $1a, .Dana
- if_equal $1f, .Tiffany
- if_equal $24, .Erin
+ if_equal PHONE_POKEFAN_BEVERLY, .Beverly
+ if_equal PHONE_COOLTRAINERF_BETH, .Beth
+ if_equal PHONE_COOLTRAINERF_REENA, .Reena
+ if_equal PHONE_PICNICKER_LIZ, .Liz
+ if_equal PHONE_PICNICKER_GINA, .Gina
+ if_equal PHONE_LASS_DANA, .Dana
+ if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
+ if_equal PHONE_PICNICKER_ERIN, .Erin
.Beverly
farwritetext BeverlyAskNumber2Text
@@ -1490,14 +1490,14 @@ RegisteredNumberFScript:
NumberAcceptedFScript: ; 0xbcbd3
checkcode VAR_CALLERID
- if_equal $6, .Beverly
- if_equal $c, .Beth
- if_equal $e, .Reena
- if_equal $12, .Liz
- if_equal $15, .Gina
- if_equal $1a, .Dana
- if_equal $1f, .Tiffany
- if_equal $24, .Erin
+ if_equal PHONE_POKEFAN_BEVERLY, .Beverly
+ if_equal PHONE_COOLTRAINERF_BETH, .Beth
+ if_equal PHONE_COOLTRAINERF_REENA, .Reena
+ if_equal PHONE_PICNICKER_LIZ, .Liz
+ if_equal PHONE_PICNICKER_GINA, .Gina
+ if_equal PHONE_LASS_DANA, .Dana
+ if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
+ if_equal PHONE_PICNICKER_ERIN, .Erin
.Beverly
farwritetext BeverlyNumberAcceptedText
@@ -1542,14 +1542,14 @@ NumberAcceptedFScript: ; 0xbcbd3
NumberDeclinedFScript:
checkcode VAR_CALLERID
- if_equal $6, .Beverly
- if_equal $c, .Beth
- if_equal $e, .Reena
- if_equal $12, .Liz
- if_equal $15, .Gina
- if_equal $1a, .Dana
- if_equal $1f, .Tiffany
- if_equal $24, .Erin
+ if_equal PHONE_POKEFAN_BEVERLY, .Beverly
+ if_equal PHONE_COOLTRAINERF_BETH, .Beth
+ if_equal PHONE_COOLTRAINERF_REENA, .Reena
+ if_equal PHONE_PICNICKER_LIZ, .Liz
+ if_equal PHONE_PICNICKER_GINA, .Gina
+ if_equal PHONE_LASS_DANA, .Dana
+ if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
+ if_equal PHONE_PICNICKER_ERIN, .Erin
.Beverly
farwritetext BeverlyNumberDeclinedText
@@ -1594,14 +1594,14 @@ NumberDeclinedFScript:
PhoneFullFScript:
checkcode VAR_CALLERID
- if_equal $6, .Beverly
- if_equal $c, .Beth
- if_equal $e, .Reena
- if_equal $12, .Liz
- if_equal $15, .Gina
- if_equal $1a, .Dana
- if_equal $1f, .Tiffany
- if_equal $24, .Erin
+ if_equal PHONE_POKEFAN_BEVERLY, .Beverly
+ if_equal PHONE_COOLTRAINERF_BETH, .Beth
+ if_equal PHONE_COOLTRAINERF_REENA, .Reena
+ if_equal PHONE_PICNICKER_LIZ, .Liz
+ if_equal PHONE_PICNICKER_GINA, .Gina
+ if_equal PHONE_LASS_DANA, .Dana
+ if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
+ if_equal PHONE_PICNICKER_ERIN, .Erin
.Beverly
farwritetext BeverlyPhoneFullText
@@ -1646,13 +1646,13 @@ PhoneFullFScript:
RematchFScript:
checkcode VAR_CALLERID
- if_equal $c, .Beth
- if_equal $e, .Reena
- if_equal $12, .Liz
- if_equal $15, .Gina
- if_equal $1a, .Dana
- if_equal $1f, .Tiffany
- if_equal $24, .Erin
+ if_equal PHONE_COOLTRAINERF_BETH, .Beth
+ if_equal PHONE_COOLTRAINERF_REENA, .Reena
+ if_equal PHONE_PICNICKER_LIZ, .Liz
+ if_equal PHONE_PICNICKER_GINA, .Gina
+ if_equal PHONE_LASS_DANA, .Dana
+ if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
+ if_equal PHONE_PICNICKER_ERIN, .Erin
.Beth
farwritetext BethRematchText
@@ -1692,10 +1692,10 @@ RematchFScript:
GiftFScript:
checkcode VAR_CALLERID
- if_equal $6, .Beverly
- if_equal $15, .Gina
- if_equal $1a, .Dana
- if_equal $1f, .Tiffany
+ if_equal PHONE_POKEFAN_BEVERLY, .Beverly
+ if_equal PHONE_PICNICKER_GINA, .Gina
+ if_equal PHONE_LASS_DANA, .Dana
+ if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
.Beverly
farwritetext BeverlyGiftText
@@ -1716,11 +1716,11 @@ GiftFScript:
PackFullFScript:
checkcode VAR_CALLERID
- if_equal $6, .Beverly
- if_equal $15, .Gina
- if_equal $1a, .Dana
- if_equal $1f, .Tiffany
- if_equal $24, .Erin
+ if_equal PHONE_POKEFAN_BEVERLY, .Beverly
+ if_equal PHONE_PICNICKER_GINA, .Gina
+ if_equal PHONE_LASS_DANA, .Dana
+ if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
+ if_equal PHONE_PICNICKER_ERIN, .Erin
.Beverly
farwritetext BeverlyPackFullText
@@ -1750,7 +1750,7 @@ PackFullFScript:
RematchGiftFScript:
checkcode VAR_CALLERID
- if_equal $24, .Erin
+ if_equal PHONE_PICNICKER_ERIN, .Erin
.Erin
loadfont
@@ -1761,7 +1761,7 @@ RematchGiftFScript:
GymStatue1Script:
mapnametotext $0
loadfont
- farwritetext UnknownText_0x1b074e
+ farwritetext GymStatue_CityGymText
closetext
loadmovesprites
end
@@ -1769,114 +1769,114 @@ GymStatue1Script:
GymStatue2Script:
mapnametotext $0
loadfont
- farwritetext UnknownText_0x1b074e
+ farwritetext GymStatue_CityGymText
keeptextopen
- farwritetext UnknownText_0x1b075c
+ farwritetext GymStatue_WinningTrainersText
closetext
loadmovesprites
end
-UnknownScript_0xbcdb9: ; 0xbcdb9
+ReceiveItemScript: ; 0xbcdb9
waitbutton
- farwritetext UnknownText_0x1b0648
+ farwritetext ReceivedItemText
playsound SFX_ITEM
waitbutton
end
; 0xbcdc3
-UnknownScript_0xbcdc3: ; 0xbcdc3
+ReceiveTogepiEggScript: ; 0xbcdc3
waitbutton
- farwritetext UnknownText_0x1b0648
+ farwritetext ReceivedItemText
playsound SFX_GET_EGG_FROM_DAYCARE_LADY
waitbutton
end
; 0xbcdcd
-UnknownScript_0xbcdcd: ; 0xbcdcd
+GameCornerCoinVendorScript: ; 0xbcdcd
faceplayer
loadfont
- farwritetext UnknownText_0x1b077f
+ farwritetext CoinVendor_WelcomeText
keeptextopen
checkitem COIN_CASE
- iftrue UnknownScript_0xbcde0
- farwritetext UnknownText_0x1b079c
+ iftrue CoinVendor_IntroScript
+ farwritetext CoinVendor_NoCoinCaseText
closetext
loadmovesprites
end
; 0xbcde0
-UnknownScript_0xbcde0: ; 0xbcde0
- farwritetext UnknownText_0x1b07e3
+CoinVendor_IntroScript: ; 0xbcde0
+ farwritetext CoinVendor_IntroText
-UnknownScript_0xbcde4: ; 0xbcde4
+CoinVendor_SellCoinsMenuScript: ; 0xbcde4
special Function24b4e
- loadmenudata MenuDataHeader_0xbce54
+ loadmenudata CoinVendor_MenuDataHeader
interpretmenu2
writebackup
- if_equal $1, UnknownScript_0xbcdf7
- if_equal $2, UnknownScript_0xbce1b
- jump UnknownScript_0xbce4d
+ if_equal $1, CoinVendor_Buy50CoinsScript
+ if_equal $2, CoinVendor_Buy500CoinsScript
+ jump CoinVendor_CancelScript
; 0xbcdf7
-UnknownScript_0xbcdf7: ; 0xbcdf7
+CoinVendor_Buy50CoinsScript: ; 0xbcdf7
checkcoins 9949
- if_equal $0, UnknownScript_0xbce46
+ if_equal $0, CoinVendor_CoinCaseFullScript
checkmoney $0, 1000
- if_equal $2, UnknownScript_0xbce3f
+ if_equal $2, CoinVendor_NotEnoughMoneyScript
givecoins 50
takemoney $0, 1000
waitbutton
playsound SFX_TRANSACTION
- farwritetext UnknownText_0x1b0830
+ farwritetext CoinVendor_Buy50CoinsText
closetext
- jump UnknownScript_0xbcde4
+ jump CoinVendor_SellCoinsMenuScript
; 0xbce1b
-UnknownScript_0xbce1b: ; 0xbce1b
+CoinVendor_Buy500CoinsScript: ; 0xbce1b
checkcoins 9499
- if_equal $0, UnknownScript_0xbce46
+ if_equal $0, CoinVendor_CoinCaseFullScript
checkmoney $0, 10000
- if_equal $2, UnknownScript_0xbce3f
+ if_equal $2, CoinVendor_NotEnoughMoneyScript
givecoins 500
takemoney $0, 10000
waitbutton
playsound SFX_TRANSACTION
- farwritetext UnknownText_0x1b084f
+ farwritetext CoinVendor_Buy500CoinsText
closetext
- jump UnknownScript_0xbcde4
+ jump CoinVendor_SellCoinsMenuScript
; 0xbce3f
-UnknownScript_0xbce3f: ; 0xbce3f
- farwritetext UnknownText_0x1b086f
+CoinVendor_NotEnoughMoneyScript: ; 0xbce3f
+ farwritetext CoinVendor_NotEnoughMoneyText
closetext
loadmovesprites
end
; 0xbce46
-UnknownScript_0xbce46: ; 0xbce46
- farwritetext UnknownText_0x1b088c
+CoinVendor_CoinCaseFullScript: ; 0xbce46
+ farwritetext CoinVendor_CoinCaseFullText
closetext
loadmovesprites
end
; 0xbce4d
-UnknownScript_0xbce4d: ; 0xbce4d
- farwritetext UnknownText_0x1b08ad
+CoinVendor_CancelScript: ; 0xbce4d
+ farwritetext CoinVendor_CancelText
closetext
loadmovesprites
end
; 0xbce54
-MenuDataHeader_0xbce54: ; 0xbce54
+CoinVendor_MenuDataHeader: ; 0xbce54
db $40 ; flags
db 04, 00 ; start coords
db 11, 15 ; end coords
- dw MenuData2_0xbce5c
+ dw CoinVendor_MenuData2
db 1 ; default option
; 0xbce5c
-MenuData2_0xbce5c: ; 0xbce5c
+CoinVendor_MenuData2: ; 0xbce5c
db $80 ; flags
db 3 ; items
db " 50 : ¥1000@"
@@ -1888,7 +1888,7 @@ MenuData2_0xbce5c: ; 0xbce5c
HappinessCheckScript:
faceplayer
loadfont
- special Function718d
+ special GetFirstPokemonHappiness
if_less_than 50, .Unhappy
if_less_than 150, .KindaHappy
farwritetext HappinessText3
@@ -1908,7 +1908,7 @@ HappinessCheckScript:
loadmovesprites
end
-MovementData_0xbcea1: ; bcea1
+Movement_ContestResults_WalkAfterWarp: ; bcea1
step_right
step_down
turn_head_up
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 18:42:19 +0000