summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/battle_start.asm6
-rwxr-xr-xengine/card_flip.asm2
-rw-r--r--engine/color.asm32
-rw-r--r--engine/credits.asm4
-rw-r--r--engine/events.asm28
-rw-r--r--engine/map_setup.asm32
-rw-r--r--engine/pokedex.asm2
-rw-r--r--engine/scripting.asm4
-rw-r--r--engine/timeofdaypals.asm8
-rw-r--r--engine/title.asm6
10 files changed, 63 insertions, 61 deletions
diff --git a/engine/battle_start.asm b/engine/battle_start.asm
index 181f4135f..0897b8a4a 100644
--- a/engine/battle_start.asm
+++ b/engine/battle_start.asm
@@ -26,7 +26,7 @@ Predef_StartBattle: ; 8c20f
ld a, $5
ld [rSVBK], a
- ld hl, Unkn1Pals
+ ld hl, wMapPals
ld bc, $0040
xor a
call ByteFill
@@ -659,7 +659,7 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
ld [rSVBK], a
call .copypals
push hl
- ld de, Unkn1Pals + 8 * 7
+ ld de, wMapPals + 8 * 7
ld bc, $8
call CopyBytes
pop hl
@@ -678,7 +678,7 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
ret
.copypals: ; 8c677 (23:4677)
- ld de, Unkn1Pals + 8 * 7
+ ld de, wMapPals + 8 * 7
call .copy
ld de, BGPals + 8 * 7
call .copy
diff --git a/engine/card_flip.asm b/engine/card_flip.asm
index cf19cdbaf..8ee1e5cd9 100755
--- a/engine/card_flip.asm
+++ b/engine/card_flip.asm
@@ -1621,7 +1621,7 @@ Functione0c37: ; e0c37 (38:4c37)
ld a, $5
ld [rSVBK], a
ld hl, Palette_e0c93
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $48
call CopyBytes
pop af
diff --git a/engine/color.asm b/engine/color.asm
index 5254fb80a..8530c2181 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -149,7 +149,7 @@ Function8b07: ; 8b07
call CheckCGB
ret z
ld hl, Palette8b2f
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $0008
ld a, $5
call FarCopyWRAM
@@ -275,7 +275,7 @@ endr
asm_8bd7
push hl
- ld hl, Unkn1Pals
+ ld hl, wMapPals
ld de, $0008
.asm_8bde
and a
@@ -338,7 +338,7 @@ Function8c1d: ; 8c1d
call Function976b
.asm_8c33
- ld de, Unkn1Pals
+ ld de, wMapPals
call Function9643
call Function9699
call Function96b3
@@ -412,11 +412,11 @@ endr
ld a, $5
ld [rSVBK], a
ld a, [hli]
- ld [Unkn1Pals], a
- ld [Unkn1Pals + 8 * 2], a
+ ld [wMapPals], a
+ ld [wMapPals + 8 * 2], a
ld a, [hl]
- ld [Unkn1Pals + 1], a
- ld [Unkn1Pals + 8 * 2 + 1], a
+ ld [wMapPals + 1], a
+ ld [wMapPals + 8 * 2 + 1], a
pop af
ld [rSVBK], a
call Function96a4
@@ -458,7 +458,7 @@ endr
ret
.asm_8cf0
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, $0008
ld a, $5
call FarCopyWRAM
@@ -525,7 +525,7 @@ INCLUDE "predef/cgb.asm"
Function95f0: ; 95f0
ld hl, Palette_9608
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, 8
ld a, $5
call FarCopyWRAM
@@ -544,7 +544,7 @@ Palette_9608: ; 9608
CopyFourPalettes: ; 9610
- ld de, Unkn1Pals
+ ld de, wMapPals
ld c, $4
CopyPalettes: ; 9615
@@ -644,7 +644,7 @@ Function9673: ; 9673
push af
ld a, $5
ld [rSVBK], a
- ld hl, Unkn1Pals
+ ld hl, wMapPals
ld c, $8
.asm_9683
ld a, $ff
@@ -676,7 +676,7 @@ Function9699: ; 9699
; 96a4
Function96a4: ; 96a4
- ld hl, Unkn1Pals
+ ld hl, wMapPals
ld de, BGPals
ld bc, $0080
ld a, $5
@@ -1047,7 +1047,7 @@ Function9890:: ; 9890
push af
ld a, $5
ld [rSVBK], a
- ld hl, Unkn1Pals
+ ld hl, wMapPals
call Function98df
ld hl, BGPals
call Function98df
@@ -1945,7 +1945,7 @@ INCLUDE "gfx/trainers/palette_pointers.asm"
; b1de
Functionb1de: ; b1de
- callba Function494ac
+ callba LoadSpecialMapPalette
jr c, .asm_b230
ld a, [wPermission]
@@ -1973,7 +1973,7 @@ endr
push af
ld a, $5
ld [rSVBK], a
- ld hl, Unkn1Pals
+ ld hl, wMapPals
ld b, $8
.asm_b210
ld a, [de]
@@ -2036,7 +2036,7 @@ rept 4
inc hl
endr
.asm_b26d
- ld de, Unkn1Pals + 8 * 6 + 2
+ ld de, wMapPals + 8 * 6 + 2
ld bc, 4
ld a, $5
call FarCopyWRAM
diff --git a/engine/credits.asm b/engine/credits.asm
index 3cee62e13..6b35fbe6a 100644
--- a/engine/credits.asm
+++ b/engine/credits.asm
@@ -637,10 +637,10 @@ GetCreditsPalette: ; 109b2c
push af
push hl
- add Unkn1Pals % $100
+ add wMapPals % $100
ld e, a
ld a, 0
- adc Unkn1Pals / $100
+ adc wMapPals / $100
ld d, a
ld bc, 24
call CopyBytes
diff --git a/engine/events.asm b/engine/events.asm
index 3a3c2b9be..bd26afffd 100644
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -342,7 +342,7 @@ CheckTrainerBattle3: ; 96867
call CheckTrainerBattle2
jr nc, .nope
- ld a, 1
+ ld a, PLAYEREVENT_SEENBYTRAINER
scf
ret
@@ -359,10 +359,10 @@ CheckTileEvent: ; 96874
jr z, .bit2
callba CheckMovingOffEdgeOfMap
- jr c, .return4
+ jr c, .map_connection
call CheckWarpTile
- jr c, .return6
+ jr c, .warp_tile
.bit2
call CheckBit1_ScriptFlags3
@@ -390,21 +390,21 @@ CheckTileEvent: ; 96874
xor a
ret
-.return4
- ld a, 4
+.map_connection
+ ld a, PLAYEREVENT_CONNECTION
scf
ret
-.return6
+.warp_tile
ld a, [PlayerStandingTile]
call CheckPitTile
- jr nz, .pittile
- ld a, 6
+ jr nz, .not_pit
+ ld a, PLAYEREVENT_FALL
scf
ret
-.pittile
- ld a, 5
+.not_pit
+ ld a, PLAYEREVENT_WARP
scf
ret
@@ -711,7 +711,7 @@ TryReadSign: ; 96a38
ret
.IsSign
- ld a, [wd040]
+ ld a, [EngineBuffer3]
ld hl, .signs
rst JumpTable
ret
@@ -749,7 +749,7 @@ TryReadSign: ; 96a38
.read
call PlayTalkObject
- ld hl, wd041
+ ld hl, EngineBuffer4
ld a, [hli]
ld h, [hl]
ld l, a
@@ -811,7 +811,7 @@ endr
CheckSignFlag: ; 96ad8
- ld hl, wd041
+ ld hl, EngineBuffer4
ld a, [hli]
ld h, [hl]
ld l, a
@@ -820,7 +820,7 @@ CheckSignFlag: ; 96ad8
call GetFarHalfword
ld e, l
ld d, h
- ld b, $2 ; check
+ ld b, CHECK_FLAG
call EventFlagAction
ld a, c
and a
diff --git a/engine/map_setup.asm b/engine/map_setup.asm
index 09fc4d155..9c99df2f6 100644
--- a/engine/map_setup.asm
+++ b/engine/map_setup.asm
@@ -270,7 +270,7 @@ MapSetupCommands: ; 15440
dba EnterMapConnection ; 18
dba LoadWarpData ; 19
dba LoadMapAttributes ; 1a
- dba LoadMapAttributes_IgnoreHidden ; 1b
+ dba LoadMapAttributes_SkipPeople ; 1b
dba ClearBGPalettes ; 1c
dba FadeOutPalettes ; 1d
dba FadeInPalettes ; 1e
@@ -318,7 +318,7 @@ LoadObjectsRunCallback_02: ; 154d7
ret
; 154ea (5:54ea)
-Function154ea: ; 154ea
+; unreferenced
ret
; 154eb
@@ -333,20 +333,21 @@ DelayLoadingNewSprites: ; 154f1
set 6, [hl]
ret
-Function154f7: ; 154f7
+CheckReplaceKrisSprite: ; 154f7
nop
- call Function1550c
+ call .CheckBiking
jr c, .ok
- call Function1554e
+ call .CheckSurfing
jr c, .ok
- call Function1551a
+ call .CheckSurfing2
jr c, .ok
ret
+
.ok
call ReplaceKrisSprite
ret
-Function1550c: ; 1550c (5:550c)
+.CheckBiking: ; 1550c (5:550c)
and a
ld hl, BikeFlags
bit 1, [hl]
@@ -356,7 +357,7 @@ Function1550c: ; 1550c (5:550c)
scf
ret
-Function1551a: ; 1551a (5:551a)
+.CheckSurfing2: ; 1551a (5:551a)
ld a, [PlayerState]
cp PLAYER_NORMAL
jr z, .nope
@@ -367,11 +368,11 @@ Function1551a: ; 1551a (5:551a)
cp PLAYER_SURF_PIKA
jr z, .surfing
call GetMapPermission
- cp $3
+ cp INDOOR
jr z, .checkbiking
- cp $5
+ cp PERM_5
jr z, .checkbiking
- cp $7
+ cp DUNGEON
jr z, .checkbiking
jr .nope
.checkbiking
@@ -383,21 +384,22 @@ Function1551a: ; 1551a (5:551a)
ld [PlayerState], a
scf
ret
+
.nope
and a
ret
-Function1554e: ; 1554e (5:554e)
+.CheckSurfing: ; 1554e (5:554e)
call CheckOnWater
jr nz, .ret_nc
ld a, [PlayerState]
cp PLAYER_SURF
- jr z, .surfing
+ jr z, ._surfing
cp PLAYER_SURF_PIKA
- jr z, .surfing
+ jr z, ._surfing
ld a, PLAYER_SURF
ld [PlayerState], a
-.surfing
+._surfing
scf
ret
.ret_nc
diff --git a/engine/pokedex.asm b/engine/pokedex.asm
index c331f4a2a..8d5680ded 100644
--- a/engine/pokedex.asm
+++ b/engine/pokedex.asm
@@ -2367,7 +2367,7 @@ Function41401: ; 41401 (10:5401)
push af
ld a, $5
ld [rSVBK], a
- ld hl, Unkn1Pals
+ ld hl, wMapPals
ld bc, $40
xor a
call ByteFill
diff --git a/engine/scripting.asm b/engine/scripting.asm
index cbc8c0028..ae5041bc2 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -2874,7 +2874,7 @@ Script_warpmod: ; 0x97a65
; map_id (MapIdParam)
call GetScriptByte
- ld [wdcac], a
+ ld [BackupWarpNumber], a
call GetScriptByte
ld [BackupMapGroup], a
call GetScriptByte
@@ -2985,7 +2985,7 @@ Script_reloadmappart:: ; 0x97ae3
Script_warpcheck: ; 0x97af6
; script command 0x8e
- call Function224a
+ call WarpCheck
ret nc
callba SetAll_ScriptFlags3
ret
diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm
index 1dbd9b2ee..6ebb2a421 100644
--- a/engine/timeofdaypals.asm
+++ b/engine/timeofdaypals.asm
@@ -39,7 +39,7 @@ _TimeOfDayPals:: ; 8c011
; save bg palette 8
- ld hl, Unkn1Pals + 8 * 7 ; Unkn1Pals + 7 pals
+ ld hl, wMapPals + 8 * 7 ; wMapPals + 7 pals
; save wram bank
ld a, [rSVBK]
@@ -70,7 +70,7 @@ _TimeOfDayPals:: ; 8c011
; restore bg palette 8
- ld hl, Unkn2Pals - 1 ; last byte in Unkn1Pals
+ ld hl, Unkn2Pals - 1 ; last byte in wMapPals
; save wram bank
ld a, [rSVBK]
@@ -172,12 +172,12 @@ Function8c0c1: ; 8c0c1
push af
ld a, $5
ld [rSVBK], a
- ld hl, Unkn1Pals
+ ld hl, wMapPals
ld a, [hli]
ld e, a
ld a, [hli]
ld d, a
- ld hl, Unkn1Pals + 8
+ ld hl, wMapPals + 8
ld c, $6
.asm_8c0d4
ld a, e
diff --git a/engine/title.asm b/engine/title.asm
index a9b991e6b..0fbf8b42d 100644
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -144,7 +144,7 @@ _TitleScreen: ; 10ed67
; Update palette colors
ld hl, TitleScreenPalettes
- ld de, Unkn1Pals
+ ld de, wMapPals
ld bc, 4 * 32
call CopyBytes
@@ -220,7 +220,7 @@ _TitleScreen: ; 10ed67
ld [hBGMapMode], a
xor a
- ld [Unkn1Pals + 2], a
+ ld [wMapPals + 2], a
; Play starting sound effect
call SFXChannelsOff
@@ -231,7 +231,7 @@ _TitleScreen: ; 10ed67
; 10eea7
SuicuneFrameIterator: ; 10eea7
- ld hl, Unkn1Pals + 2
+ ld hl, wMapPals + 2
ld a, [hl]
ld c, a
inc [hl]
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 15:33:37 +0000