summaryrefslogtreecommitdiff
path: root/src/engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/ai/attacks.asm4
-rw-r--r--src/engine/ai/init.asm2
-rw-r--r--src/engine/ai/retreat.asm4
-rw-r--r--src/engine/ai/trainer_cards.asm4
-rw-r--r--src/engine/bank02.asm14
-rw-r--r--src/engine/bank03.asm183
-rw-r--r--src/engine/bank04.asm80
-rw-r--r--src/engine/bank06.asm14
-rw-r--r--src/engine/bank07.asm31
-rw-r--r--src/engine/bank1c.asm6
-rw-r--r--src/engine/bank20.asm558
-rw-r--r--src/engine/home.asm30
-rw-r--r--src/engine/sequences/opening_sequence_commands.asm70
13 files changed, 501 insertions, 499 deletions
diff --git a/src/engine/ai/attacks.asm b/src/engine/ai/attacks.asm
index 3b331a6..69ae2e1 100644
--- a/src/engine/ai/attacks.asm
+++ b/src/engine/ai/attacks.asm
@@ -147,8 +147,8 @@ AIProcessAttacks: ; 169fc (5:69fc)
; return carry if attack is chosen
; and AI tries to use it.
.use_attack
- ld a, $01
- ld [wcddb], a
+ ld a, TRUE
+ ld [wAITriedAttack], a
call AITryUseAttack
scf
ret
diff --git a/src/engine/ai/init.asm b/src/engine/ai/init.asm
index 9f252d6..406d7d9 100644
--- a/src/engine/ai/init.asm
+++ b/src/engine/ai/init.asm
@@ -19,7 +19,7 @@ InitAITurnVars: ; 15649 (5:5649)
xor a
ld [wPreviousAIFlags], a
- ld [wcddb], a
+ ld [wAITriedAttack], a
ld [wcddc], a
ld [wAIRetreatedThisTurn], a
diff --git a/src/engine/ai/retreat.asm b/src/engine/ai/retreat.asm
index 04fc415..768a48b 100644
--- a/src/engine/ai/retreat.asm
+++ b/src/engine/ai/retreat.asm
@@ -434,7 +434,7 @@ AIDecideWhetherToRetreat: ; 158b2 (5:58b2)
jr .set_carry
; if player's turn and loaded attack is not a Pokémon Power OR
-; if opponent's turn and wcddb == 0
+; if opponent's turn and wAITriedAttack == 0
; set wcdda's bit 7 flag
Func_15b54: ; 15b54 (5:5b54)
xor a
@@ -450,7 +450,7 @@ Func_15b54: ; 15b54 (5:5b54)
jr .set_flag
.opponent
- ld a, [wcddb]
+ ld a, [wAITriedAttack]
or a
ret nz
diff --git a/src/engine/ai/trainer_cards.asm b/src/engine/ai/trainer_cards.asm
index e85b022..6c1f3a2 100644
--- a/src/engine/ai/trainer_cards.asm
+++ b/src/engine/ai/trainer_cards.asm
@@ -1,7 +1,7 @@
INCLUDE "data/ai_trainer_card_logic.asm"
_AIProcessHandTrainerCards: ; 200e5 (8:40e5)
- ld [wce18], a
+ ld [wAITrainerCardPhase], a
; create hand list in wDuelTempList and wTempHandCardList.
call CreateHandCardList
ld hl, wDuelTempList
@@ -16,7 +16,7 @@ _AIProcessHandTrainerCards: ; 200e5 (8:40e5)
ret z
push hl
- ld a, [wce18]
+ ld a, [wAITrainerCardPhase]
ld d, a
ld hl, AITrainerCardLogic
.loop_data
diff --git a/src/engine/bank02.asm b/src/engine/bank02.asm
index 1911dd4..0b1f6f7 100644
--- a/src/engine/bank02.asm
+++ b/src/engine/bank02.asm
@@ -1376,7 +1376,7 @@ DisplayCheckMenuCursor_YourOrOppPlayArea: ; 8760 (2:4760)
_HandlePeekSelection: ; 8764 (2:4764)
call Set_OBJ_8x8
call LoadCursorTile
-; reset ce5c and wIsSwapTurnPending
+; reset wce5c and wIsSwapTurnPending
xor a
ld [wce5c], a
ld [wIsSwapTurnPending], a
@@ -1530,7 +1530,7 @@ endr
; input:
; a = deck index of card to be loaded
; output:
-; a = ce5c
+; a = wce5c
; with upper bit set if turn was swapped
.ShowSelectedCard ; 8855 (2:4855)
ld b, a
@@ -3485,10 +3485,10 @@ HandleDeckConfigurationMenu: ; 9480 (2:5480)
ConfirmDeckConfiguration: ; 94d3 (2:54d3)
ld hl, wCardListVisibleOffset
ld a, [hl]
- ld hl, wced8
+ ld hl, wCardListVisibleOffsetBackup
ld [hl], a
call HandleDeckConfirmationMenu
- ld hl, wced8
+ ld hl, wCardListVisibleOffsetBackup
ld a, [hl]
ld hl, wCardListVisibleOffset
ld [hl], a
@@ -7714,10 +7714,10 @@ HandlePrinterMenu: ; ad51 (2:6d51)
ldh a, [hCurMenuItem]
cp $ff
call z, PrinterMenu_QuitPrint
- ld [wcfe4], a
+ ld [wSelectedPrinterMenuItem], a
ld hl, PrinterMenuFunctionTable
call JumpToFunctionInTable
- ld a, [wcfe4]
+ ld a, [wSelectedPrinterMenuItem]
jr .loop
PrinterMenu_QuitPrint: ; ad9a (2:6d9a)
@@ -7761,7 +7761,7 @@ PrinterMenu_PrintQuality: ; adb5 (2:6db5)
call DisableSRAM
.asm_ade2
add sp, $2 ; exit menu
- ld a, [wcfe4]
+ ld a, [wSelectedPrinterMenuItem]
ld hl, PrinterMenuParameters
call InitializeMenuParameters
ldtx hl, WhatWouldYouLikeToPrintText
diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm
index c103ba2..3c83056 100644
--- a/src/engine/bank03.asm
+++ b/src/engine/bank03.asm
@@ -6,8 +6,8 @@ LoadMap: ; c000 (3:4000)
ld a, GAME_EVENT_OVERWORLD
ld [wGameEvent], a
xor a
- ld [wd10f], a
- ld [wd110], a
+ ld [wReloadOverworldCallbackPtr], a
+ ld [wReloadOverworldCallbackPtr + 1], a
ld [wMatchStartTheme], a
farcall Func_10a9b
call WhiteOutDMGPals
@@ -46,7 +46,7 @@ LoadMap: ; c000 (3:4000)
call SetOverworldDoFrameFunction
xor a
ld [wOverworldTransition], a
- ld [wd0c1], a
+ ld [wOverworldNPCFlags], a
call PlayDefaultSong
farcall Func_10af9
call Func_c141
@@ -128,19 +128,19 @@ EnterScript: ; c10a (3:410a)
; closes dialogue window. seems to be for other things as well.
CloseAdvancedDialogueBox: ; c111 (3:4111)
- ld a, [wd0c1]
- bit 0, a
+ ld a, [wOverworldNPCFlags]
+ bit AUTO_CLOSE_TEXTBOX, a
call nz, CloseTextBox
- ld a, [wd0c1]
- bit 1, a
- jr z, .asm_c12a
+ ld a, [wOverworldNPCFlags]
+ bit RESTORE_FACING_DIRECTION, a
+ jr z, .skip
ld a, [wScriptNPC]
ld [wLoadedNPCTempIndex], a
farcall Func_1c5e9
-.asm_c12a
+.skip
xor a
- ld [wd0c1], a
- ld a, [wd0c0]
+ ld [wOverworldNPCFlags], a
+ ld a, [wOverworldModeBackup]
ld [wOverworldMode], a
ret
@@ -148,32 +148,32 @@ CloseAdvancedDialogueBox: ; c111 (3:4111)
CloseTextBox: ; c135 (3:4135)
push hl
farcall ReloadMapAfterTextClose
- ld hl, wd0c1
- res 0, [hl]
+ ld hl, wOverworldNPCFlags
+ res AUTO_CLOSE_TEXTBOX, [hl]
pop hl
ret
Func_c141: ; c141 (3:4141)
- ld hl, wd0c2
+ ld hl, wActiveGameEvent
ld a, [hl]
or a
ret z
push af
xor a
- ld [hl], a
+ ld [hl], a ; clear game event
pop af
dec a
ld hl, PointerTable_c152
jp JumpToFunctionInTable
PointerTable_c152: ; c152 (3:4152)
- dw Func_c9bc
- dw Func_fc2b
- dw Func_fcad
+ dw Func_c9bc ; GAME_EVENT_DUEL
+ dw Func_fc2b ; GAME_EVENT_BATTLE_CENTER
+ dw Func_fcad ; GAME_EVENT_GIFT_CENTER
Func_c158: ; c158 (3:4158)
- ld a, [wd0c2]
- cp $1
+ ld a, [wActiveGameEvent]
+ cp GAME_EVENT_DUEL
ret nz
ld a, [wNPCDuelist]
ld [wTempNPC], a
@@ -205,7 +205,7 @@ Func_c184: ; c184 (3:4184)
.not_map
ld a, c
ld [wOverworldMode], a
- ld [wd0c0], a
+ ld [wOverworldModeBackup], a
pop bc
ret
@@ -263,9 +263,9 @@ Func_c1f8: ; c1f8 (3:41f8)
ld [wSelectedPCMenuItem], a
ld [wSelectedGiftCenterMenuItem], a
ld [wConfigCursorYPos], a
- ld [wd0c2], a
+ ld [wActiveGameEvent], a
ld [wDefaultSong], a
- ld [wd112], a
+ ld [wSongOverride], a
ld [wRonaldIsInMap], a
call EnableSRAM
ld a, [sAnimationsDisabled]
@@ -352,9 +352,9 @@ Func_c280: ; c280 (3:4280)
farcall Func_12871
ret
-Func_c29b: ; c29b (3:429b)
+SetOverworldNPCFlags: ; c29b (3:429b)
push hl
- ld hl, wd0c1
+ ld hl, wOverworldNPCFlags
or [hl]
ld [hl], a
pop hl
@@ -364,10 +364,10 @@ Func_c2a3: ; c2a3 (3:42a3)
push hl
push bc
push de
- call Func_c335
+ call BackupObjectPalettes
farcall Func_10ab4
- ld a, $80
- call Func_c29b
+ ld a, 1 << HIDE_ALL_NPC_SPRITES
+ call SetOverworldNPCFlags
lb de, $30, $7f
call SetupText
farcall Func_12ba7
@@ -383,12 +383,13 @@ Func_c2a3: ; c2a3 (3:42a3)
pop hl
ret
-Func_c2d4: ; c2d4 (3:42d4)
+ReturnToOverworldNoCallback: ; c2d4 (3:42d4)
xor a
- ld [wd10f], a
- ld [wd110], a
+ ld [wReloadOverworldCallbackPtr], a
+ ld [wReloadOverworldCallbackPtr + 1], a
+; fallthrough
-Func_c2db: ; c2db (3:42db)
+ReturnToOverworld: ; c2db (3:42db)
push hl
push bc
push de
@@ -405,52 +406,52 @@ Func_c2db: ; c2db (3:42db)
farcall LoadMapGfxAndPermissions
pop af
ld [wDefaultSong], a
- ld hl, wd0c1
- res 0, [hl]
- call Func_c34e
+ ld hl, wOverworldNPCFlags
+ res AUTO_CLOSE_TEXTBOX, [hl]
+ call RestoreObjectPalettes
farcall Func_12c5e
farcall SetAllNPCTilePermissions
- ld hl, wd0c1
- res 7, [hl]
- ld hl, wd10f
+ ld hl, wOverworldNPCFlags
+ res HIDE_ALL_NPC_SPRITES, [hl]
+ ld hl, wReloadOverworldCallbackPtr
ld a, [hli]
or [hl]
- jr z, .asm_c323
+ jr z, .no_callback
ld a, [hld]
ld l, [hl]
ld h, a
call CallHL2
-.asm_c323
+.no_callback
farcall Func_10af9
pop de
pop bc
pop hl
ret
-Func_c32b: ; c32b (3:432b)
+ReturnToOverworldWithCallback: ; c32b (3:432b)
ld a, l
- ld [wd10f], a
+ ld [wReloadOverworldCallbackPtr], a
ld a, h
- ld [wd110], a
- jr Func_c2db
+ ld [wReloadOverworldCallbackPtr + 1], a
+ jr ReturnToOverworld
-Func_c335: ; c335 (3:4335)
+BackupObjectPalettes: ; c335 (3:4335)
ld a, [wOBP0]
- ld [wd10c], a
+ ld [wOBP0Backup], a
ld a, [wOBP1]
- ld [wd10d], a
+ ld [wOBP1Backup], a
ld hl, wObjectPalettesCGB
- ld de, wd0cc
+ ld de, wObjectPalettesCGBBackup
ld bc, 8 palettes
call CopyDataHLtoDE_SaveRegisters
ret
-Func_c34e: ; c34e (3:434e)
- ld a, [wd10c]
+RestoreObjectPalettes: ; c34e (3:434e)
+ ld a, [wOBP0Backup]
ld [wOBP0], a
- ld a, [wd10d]
+ ld a, [wOBP1Backup]
ld [wOBP1], a
- ld hl, wd0cc
+ ld hl, wObjectPalettesCGBBackup
ld de, wObjectPalettesCGB
ld bc, 8 palettes
call CopyDataHLtoDE_SaveRegisters
@@ -585,10 +586,10 @@ Func_c3ee: ; c3ee (3:43ee)
Func_c3ff: ; c3ff (3:43ff)
ld a, [wBGMapWidth]
- sub $14
+ sub SCREEN_WIDTH
ld [wd237], a
ld a, [wBGMapHeight]
- sub $12
+ sub SCREEN_HEIGHT
ld [wd238], a
call Func_c41c
call Func_c469
@@ -700,14 +701,14 @@ Func_c4b9: ; c4b9 (3:44b9)
ld [wd4cb], a
ld a, PALETTE_29
farcall LoadPaletteData
- ld b, $0
+ ld b, SPRITE_ANIM_LIGHT_NPC_UP
ld a, [wConsole]
cp CONSOLE_CGB
jr nz, .not_cgb
- ld b, $1e
+ ld b, SPRITE_ANIM_RED_NPC_UP
.not_cgb
ld a, b
- ld [wd337], a
+ ld [wPlayerSpriteBaseAnimation], a
; load Player's sprite for overworld
ld a, SPRITE_OW_PLAYER
@@ -877,7 +878,7 @@ UpdatePlayerSprite: ; c5e9 (3:45e9)
push bc
ld a, [wPlayerSpriteIndex]
ld [wWhichSprite], a
- ld a, [wd337]
+ ld a, [wPlayerSpriteBaseAnimation]
ld b, a
ld a, [wPlayerDirection]
add b
@@ -1119,10 +1120,10 @@ PauseMenu: ; c75a (3:475a)
call PauseSong
ld a, MUSIC_PAUSE_MENU
call PlaySong
- call Func_c797
+ call DisplayPauseMenu
.loop
- ld a, $1
- call Func_c29b
+ ld a, 1 << AUTO_CLOSE_TEXTBOX
+ call SetOverworldNPCFlags
.wait_input
call DoFrameIfLCDEnabled
call HandleMenuInput
@@ -1138,14 +1139,14 @@ PauseMenu: ; c75a (3:475a)
ld a, [wSelectedPauseMenuItem]
ld hl, PauseMenuPointerTable
call JumpToFunctionInTable
- ld hl, Func_c797
- call Func_c32b
+ ld hl, DisplayPauseMenu
+ call ReturnToOverworldWithCallback
jr .loop
.exit
call ResumeSong
ret
-Func_c797: ; c797 (3:4797)
+DisplayPauseMenu: ; c797 (3:4797)
ld a, [wSelectedPauseMenuItem]
ld hl, Unknown_10d98
farcall InitAndPrintPauseMenu
@@ -1203,10 +1204,10 @@ PCMenu: ; c7ea (3:47ea)
call DoFrameIfLCDEnabled
ldtx hl, TurnedPCOnText
call PrintScrollableText_NoTextBoxLabel
- call Func_c84e
+ call DisplayPCMenu
.loop
- ld a, $1
- call Func_c29b
+ ld a, 1 << AUTO_CLOSE_TEXTBOX
+ call SetOverworldNPCFlags
.wait_input
call DoFrameIfLCDEnabled
call HandleMenuInput
@@ -1222,8 +1223,8 @@ PCMenu: ; c7ea (3:47ea)
ld a, [wSelectedPCMenuItem]
ld hl, PointerTable_c846
call JumpToFunctionInTable
- ld hl, Func_c84e
- call Func_c32b
+ ld hl, DisplayPCMenu
+ call ReturnToOverworldWithCallback
jr .loop
.exit
call CloseTextBox
@@ -1232,7 +1233,7 @@ PCMenu: ; c7ea (3:47ea)
call Func_c891
call CloseAdvancedDialogueBox
xor a
- ld [wd112], a
+ ld [wSongOverride], a
call PlayDefaultSong
ret
@@ -1242,7 +1243,7 @@ PointerTable_c846: ; c846 (3:4846)
dw PCMenu_Glossary
dw PCMenu_Print
-Func_c84e: ; c84e (3:484e)
+DisplayPCMenu: ; c84e (3:484e)
ld a, [wSelectedPCMenuItem]
ld hl, Unknown_10da9
farcall InitAndPrintPauseMenu
@@ -1280,8 +1281,8 @@ PCMenu_Print: ; c877 (3:4877)
Func_c891: ; c891 (3:4891)
push hl
- ld a, [wd0c1]
- bit 0, a
+ ld a, [wOverworldNPCFlags]
+ bit AUTO_CLOSE_TEXTBOX, a
jr z, .asm_c8a1
ld hl, wd3b9
ld a, [hli]
@@ -1294,8 +1295,8 @@ Func_c891: ; c891 (3:4891)
ld [hli], a
ld [hl], a
pop hl
- ld a, $1
- call Func_c29b
+ ld a, 1 << AUTO_CLOSE_TEXTBOX
+ call SetOverworldNPCFlags
call Func_c241
call Func_c915
call DoFrameIfLCDEnabled
@@ -1307,8 +1308,8 @@ Func_c8ba: ; c8ba (3:48ba)
or d
jr z, Func_c891
push hl
- ld a, [wd0c1]
- bit 0, a
+ ld a, [wOverworldNPCFlags]
+ bit AUTO_CLOSE_TEXTBOX, a
jr z, .asm_c8d4
ld hl, wd3b9
ld a, [hli]
@@ -1327,8 +1328,8 @@ Func_c8ba: ; c8ba (3:48ba)
inc hl
ld [hl], d
pop hl
- ld a, $1
- call Func_c29b
+ ld a, 1 << AUTO_CLOSE_TEXTBOX
+ call SetOverworldNPCFlags
call Func_c241
call Func_c915
call DoFrameIfLCDEnabled
@@ -1340,8 +1341,8 @@ Func_c8ed: ; c8ed (3:48ed)
push bc
push de
push hl
- ld a, $1
- call Func_c29b
+ ld a, 1 << AUTO_CLOSE_TEXTBOX
+ call SetOverworldNPCFlags
call Func_c915
call DoFrameIfLCDEnabled
pop hl
@@ -2332,7 +2333,7 @@ ScriptCommand_GiveBoosterPacks: ; ce8a (3:4e8a)
jr z, .done
farcall GiveBoosterPack
.done
- call Func_c2d4
+ call ReturnToOverworldNoCallback
jp IncreaseScriptPointerBy4
ScriptCommand_GiveOneOfEachTrainerBooster: ; ceba (3:4eba)
@@ -2352,7 +2353,7 @@ ScriptCommand_GiveOneOfEachTrainerBooster: ; ceba (3:4eba)
inc hl
jr .loop
.done
- call Func_c2d4
+ call ReturnToOverworldNoCallback
jp IncreaseScriptPointerBy1
.booster_type_table
@@ -2381,7 +2382,7 @@ ScriptCommand_ShowCardReceivedScreen: ; cee2 (3:4ee2)
bank1call Func_7594
call WhiteOutDMGPals
call DoFrameIfLCDEnabled
- call Func_c2d4
+ call ReturnToOverworldNoCallback
jp IncreaseScriptPointerBy2
.legendary_card
@@ -2740,8 +2741,8 @@ ScriptCommand_ShowMedalReceivedScreen: ; d125 (3:5125)
push af
call Func_c2a3
pop af
- farcall Medal_1029e
- call Func_c2d4
+ farcall ShowMedalReceivedScreen
+ call ReturnToOverworldNoCallback
jp IncreaseScriptPointerBy2
ScriptCommand_LoadCurrentMapNameIntoTxRamSlot: ; d135 (3:5135)
@@ -3016,8 +3017,8 @@ ShowMultichoiceTextbox: ; d28c (3:528c)
jr z, .no_text
call Func_c8ba
.no_text
- ld a, $1
- call Func_c29b
+ ld a, 1 << AUTO_CLOSE_TEXTBOX
+ call SetOverworldNPCFlags
pop hl
inc hl
ld a, [hli]
@@ -3131,7 +3132,7 @@ ScriptCommand_OpenDeckMachine: ; d336 (3:5336)
farcall HandleDeckSaveMachineMenu
.asm_d364
call ResumeSong
- call Func_c2d4
+ call ReturnToOverworldNoCallback
jp IncreaseScriptPointerBy2
; args: unused, room, new player x, new player y, new player direction
@@ -3219,7 +3220,7 @@ ScriptCommand_WalkPlayerToMasonLaboratory: ; d3e0 (3:53e0)
ScriptCommand_OverrideSong: ; d3fe (3:53fe)
ld a, c
- ld [wd112], a
+ ld [wSongOverride], a
call PlaySong
jp IncreaseScriptPointerBy2
@@ -5497,7 +5498,7 @@ NPCMovement_e2ab: ; e2ab (3:62ab)
Preload_Amy: ; e2ad (3:62ad)
xor a
ld [wd3d0], a
- ld a, [wd0c2]
+ ld a, [wActiveGameEvent]
or a
jr z, .asm_e2cf
ld a, [wPlayerXCoord]
diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm
index 81e45d3..6a48c3b 100644
--- a/src/engine/bank04.asm
+++ b/src/engine/bank04.asm
@@ -152,7 +152,7 @@ LoadCollectedMedalTilemaps: ; 1010c (4:410c)
call InitTextPrinting
ldtx hl, PlayerStatusMedalsTitleText
call PrintTextNoDelay
- ld hl, Unknown_1017f
+ ld hl, MedalCoordsAndTilemaps
ld a, EVENT_MEDAL_FLAGS
farcall GetEventValue
or a
@@ -196,7 +196,7 @@ LoadCollectedMedalTilemaps: ; 1010c (4:410c)
.asm_1017e
ret
-Unknown_1017f: ; 1017f (4:417f)
+MedalCoordsAndTilemaps: ; 1017f (4:417f)
; x, y, tilemap
db 1, 10, TILEMAP_GRASS_MEDAL
db 6, 10, TILEMAP_SCIENCE_MEDAL
@@ -207,11 +207,11 @@ Unknown_1017f: ; 1017f (4:417f)
db 11, 14, TILEMAP_ROCK_MEDAL
db 16, 14, TILEMAP_FIGHTING_MEDAL
-Func_10197: ; 10197 (4:4197)
+FlashReceivedMedal: ; 10197 (4:4197)
xor a
ld [wd291], a
- ld hl, Unknown_1017f
- ld a, [wd115]
+ ld hl, MedalCoordsAndTilemaps
+ ld a, [wWhichMedal]
ld c, a
add a
add c
@@ -223,9 +223,10 @@ Func_10197: ; 10197 (4:4197)
ld a, [wMedalScreenYOffset]
add [hl]
ld c, a
- ld a, [wd116]
+ ld a, [wMedalDisplayTimer]
bit 4, a
- jr z, .asm_101c3
+ jr z, .show
+; hide
xor a
ld e, c
ld d, b
@@ -233,7 +234,8 @@ Func_10197: ; 10197 (4:4197)
lb hl, 0, 0
call FillRectangle
ret
-.asm_101c3
+
+.show
inc hl
ld a, [hl]
ld [wCurTilemap], a
@@ -366,10 +368,10 @@ Func_1029a: ; 1029a (4:429a)
call DrawPlayerPortrait
ret
-Medal_1029e: ; 1029e (4:429e)
+ShowMedalReceivedScreen: ; 1029e (4:429e)
sub $8
ld c, a
- ld [wd115], a
+ ld [wWhichMedal], a
ld a, [wd291]
push af
push bc
@@ -397,18 +399,18 @@ Medal_1029e: ; 1029e (4:429e)
ld a, MUSIC_MEDAL
call PlaySong
ld a, $ff
- ld [wd116], a
-.asm_102e2
+ ld [wMedalDisplayTimer], a
+.flash_loop
call DoFrameIfLCDEnabled
- ld a, [wd116]
+ ld a, [wMedalDisplayTimer]
inc a
- ld [wd116], a
+ ld [wMedalDisplayTimer], a
and $f
- jr nz, .asm_102e2
- call Func_10197
- ld a, [wd116]
+ jr nz, .flash_loop
+ call FlashReceivedMedal
+ ld a, [wMedalDisplayTimer]
cp $e0
- jr nz, .asm_102e2
+ jr nz, .flash_loop
ldtx hl, WonTheMedalText
call PrintScrollableText_NoTextBoxLabel
call WaitForSongToFinish
@@ -2212,8 +2214,8 @@ Unknown_10da9: ; 10da9 (4:4da9)
dw NULL ; function pointer if non-0
Func_10dba: ; 10dba (4:4dba)
- ld a, $1
- farcall Func_c29b
+ ld a, 1 << AUTO_CLOSE_TEXTBOX
+ farcall SetOverworldNPCFlags
ld a, [wSelectedGiftCenterMenuItem]
ld hl, Unknown_10e17
farcall InitAndPrintPauseMenu
@@ -2587,11 +2589,11 @@ OverworldMap_InitVolcanoSprite: ; 10fbc (4:4fbc)
ld [hli], a ; x
ld a, $10
ld [hl], a ; y
- ld b, $34 ; non-cgb volcano smoke
+ ld b, SPRITE_ANIM_SGB_VOLCANO_SMOKE
ld a, [wConsole]
cp CONSOLE_CGB
jr nz, .not_cgb
- ld b, $37 ; cgb volcano smoke
+ ld b, SPRITE_ANIM_CGB_VOLCANO_SMOKE
.not_cgb
ld a, b
farcall StartNewSpriteAnimation
@@ -2606,11 +2608,11 @@ OverworldMap_InitCursorSprite: ; 10fde (4:4fde)
call CreateSpriteAndAnimBufferEntry
ld a, [wWhichSprite]
ld [wOverworldMapCursorSprite], a
- ld b, $35 ; non-cgb overworld map cursor
+ ld b, SPRITE_ANIM_SGB_OWMAP_CURSOR
ld a, [wConsole]
cp CONSOLE_CGB
jr nz, .not_cgb
- ld b, $38 ; cgb overworld map cursor
+ ld b, SPRITE_ANIM_CGB_OWMAP_CURSOR
.not_cgb
ld a, b
ld [wOverworldMapCursorAnimation], a
@@ -2625,8 +2627,8 @@ OverworldMap_InitCursorSprite: ; 10fde (4:4fde)
.visited_lab
ret
-; play animation $36 (non-cgb) or $39 (cgb) to make the cursor blink faster
-; after a selection is made
+; play animation SPRITE_ANIM_SGB_OWMAP_CURSOR_FAST (non-cgb) or SPRITE_ANIM_CGB_OWMAP_CURSOR_FAST (cgb)
+; to make the cursor blink faster after a selection is made
OverworldMap_UpdateCursorAnimation: ; 11016 (4:5016)
ld a, [wOverworldMapCursorSprite]
ld [wWhichSprite], a
@@ -3484,7 +3486,7 @@ WRAMToSRAMMapper: ; 11498 (4:5498)
wram_sram_map wTempPlayerXCoord, 1, $00, $ff ; sTempPlayerXCoord
wram_sram_map wTempPlayerYCoord, 1, $00, $ff ; sTempPlayerYCoord
wram_sram_map wTempPlayerDirection, 1, $00, $ff ; sTempPlayerDirection
- wram_sram_map wd0c2, 1, $00, $ff ; sb814
+ wram_sram_map wActiveGameEvent, 1, $00, $ff ; sActiveGameEvent
wram_sram_map wDuelResult, 1, $00, $ff ; sDuelResult
wram_sram_map wNPCDuelist, 1, $00, $ff ; sNPCDuelist
wram_sram_map wChallengeHallNPC, 1, $00, $ff ; sChallengeHallNPC
@@ -5798,7 +5800,7 @@ LoadSpriteAnimPointers: ; 12ae2 (4:6ae2)
add hl, bc
ld [hli], a
push hl
- ld l, 6 ; 4th entry in MapDataPointers
+ ld l, 6 ; SpriteAnimations
farcall GetMapDataPointer
farcall LoadGraphicsPointerFromHL
pop hl ; hl is animation bank
@@ -6318,7 +6320,7 @@ Scene_ColosseumBooster: ; 12dbf (4:6dbf)
db TILEMAP_COLOSSEUM, TILEMAP_COLOSSEUM_CGB, $80, $00
db SPRITE_BOOSTER_PACK_OAM
db PALETTE_117, PALETTE_117, $00
- db $ff, $bd, $00, $00
+ db $ff, SPRITE_ANIM_189, $00, $00
dw $00
Scene_EvolutionBooster: ; 12dd4 (4:6dd4)
@@ -6328,7 +6330,7 @@ Scene_EvolutionBooster: ; 12dd4 (4:6dd4)
db TILEMAP_EVOLUTION, TILEMAP_EVOLUTION_CGB, $80, $00
db SPRITE_BOOSTER_PACK_OAM
db PALETTE_117, PALETTE_117, $00
- db $ff, $bd, $00, $00
+ db $ff, SPRITE_ANIM_189, $00, $00
dw $00
Scene_MysteryBooster: ; 12de9 (4:6de9)
@@ -6338,7 +6340,7 @@ Scene_MysteryBooster: ; 12de9 (4:6de9)
db TILEMAP_MYSTERY, TILEMAP_MYSTERY_CGB, $80, $00
db SPRITE_BOOSTER_PACK_OAM
db PALETTE_117, PALETTE_117, $00
- db $ff, $bd, $00, $00
+ db $ff, SPRITE_ANIM_189, $00, $00
dw $00
Scene_LaboratoryBooster: ; 12dfe (4:6dfe)
@@ -6348,7 +6350,7 @@ Scene_LaboratoryBooster: ; 12dfe (4:6dfe)
db TILEMAP_LABORATORY, TILEMAP_LABORATORY_CGB, $80, $00
db SPRITE_BOOSTER_PACK_OAM
db PALETTE_117, PALETTE_117, $00
- db $ff, $bd, $00, $00
+ db $ff, SPRITE_ANIM_189, $00, $00
dw $00
Scene_CharizardIntro: ; 12e13 (4:6e13)
@@ -6435,7 +6437,7 @@ Scene_GameBoyLinkTransmitting: ; 12e97 (4:6e97)
db TILEMAP_GAMEBOY_LINK, TILEMAP_GAMEBOY_LINK_CGB, $90, $00
db SPRITE_DUEL_52
db PALETTE_114, PALETTE_114, $00
- db $b3, $b0, $50, $50
+ db SPRITE_ANIM_179, SPRITE_ANIM_176, $50, $50
dw $00
Scene_GameBoyLinkNotConnected: ; 12eac (4:6eac)
@@ -6445,7 +6447,7 @@ Scene_GameBoyLinkNotConnected: ; 12eac (4:6eac)
db TILEMAP_GAMEBOY_LINK, TILEMAP_GAMEBOY_LINK_CGB, $90, $00
db SPRITE_DUEL_52
db PALETTE_114, PALETTE_114, $00
- db $b4, $b1, $50, $50
+ db SPRITE_ANIM_180, SPRITE_ANIM_177, $50, $50
dw $00
Scene_GameBoyPrinterTransmitting: ; 12ec1 (4:6ec1)
@@ -6455,7 +6457,7 @@ Scene_GameBoyPrinterTransmitting: ; 12ec1 (4:6ec1)
db TILEMAP_GAMEBOY_PRINTER, TILEMAP_GAMEBOY_PRINTER_CGB, $90, $00
db SPRITE_DUEL_53
db PALETTE_115, PALETTE_115, $00
- db $b7, $b5, $50, $30
+ db SPRITE_ANIM_183, SPRITE_ANIM_181, $50, $30
dw $00
Scene_GameBoyPrinterNotConnected: ; 12ed6 (4:6ed6)
@@ -6465,7 +6467,7 @@ Scene_GameBoyPrinterNotConnected: ; 12ed6 (4:6ed6)
db TILEMAP_GAMEBOY_PRINTER, TILEMAP_GAMEBOY_PRINTER_CGB, $90, $00
db SPRITE_DUEL_53
db PALETTE_115, PALETTE_115, $00
- db $b8, $b6, $50, $30
+ db SPRITE_ANIM_184, SPRITE_ANIM_182, $50, $30
dw $00
Scene_CardPop: ; 12eeb (4:6eeb)
@@ -6475,7 +6477,7 @@ Scene_CardPop: ; 12eeb (4:6eeb)
db TILEMAP_CARD_POP, TILEMAP_CARD_POP_CGB, $80, $00
db SPRITE_DUEL_54
db PALETTE_116, PALETTE_116, $00
- db $bb, $b9, $50, $40
+ db SPRITE_ANIM_187, SPRITE_ANIM_185, $50, $40
dw $00
Scene_CardPopError: ; 12f00 (4:6f00)
@@ -6485,7 +6487,7 @@ Scene_CardPopError: ; 12f00 (4:6f00)
db TILEMAP_CARD_POP, TILEMAP_CARD_POP_CGB, $80, $00
db SPRITE_DUEL_54
db PALETTE_116, PALETTE_116, $00
- db $bc, $ba, $50, $40
+ db SPRITE_ANIM_188, SPRITE_ANIM_186, $50, $40
dw $00
Scene_Nintendo: ; 12f15 (4:6f15)
@@ -7073,7 +7075,7 @@ ChallengeMachine_Duel: ; 13320 (4:7320)
call PlaySong
call WaitForSongToFinish
xor a
- ld [wd112], a
+ ld [wSongOverride], a
call SaveGeneralSaveData
bank1call StartDuel_VSAIOpp
ret
diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm
index 6ee69a3..3e517d6 100644
--- a/src/engine/bank06.asm
+++ b/src/engine/bank06.asm
@@ -3,7 +3,7 @@
_CopyCardNameAndLevel: ; 18000 (6:4000)
push bc
push de
- ld [wcd9b], a
+ ld [wCardNameLength], a
ld hl, wLoadedCard1Name
ld a, [hli]
ld h, [hl]
@@ -18,7 +18,7 @@ _CopyCardNameAndLevel: ; 18000 (6:4000)
; the name doesn't start with TX_HALFWIDTH
; this doesn't appear to be ever the case (unless caller manipulates wLoadedCard1Name)
- ld a, [wcd9b]
+ ld a, [wCardNameLength]
ld c, a
ld a, [wLoadedCard1Type]
cp TYPE_ENERGY
@@ -91,7 +91,7 @@ _CopyCardNameAndLevel: ; 18000 (6:4000)
; the name starts with TX_HALFWIDTH
_CopyCardNameAndLevel_HalfwidthText: ; 18086 (6:4086)
- ld a, [wcd9b]
+ ld a, [wCardNameLength]
inc a
add a
ld b, a
@@ -4433,7 +4433,7 @@ InputPlayerName: ; 1a7a3 (6:67a3)
ld [wNamingScreenCursorX], a
ld [wNamingScreenCursorY], a
ld a, $09
- ld [wd005], a
+ ld [wNamingScreenNumColumns], a
ld a, $06
ld [wNamingScreenKeyboardHeight], a
ld a, $0f
@@ -4651,7 +4651,7 @@ NamingScreen_CheckButtonState: ; 1a908 (6:6908)
xor a
jr .asm_69a7
.asm_6937
- ld a, [wd005]
+ ld a, [wNamingScreenNumColumns]
ld c, a
ld a, h
bit D_LEFT_F, b
@@ -5297,7 +5297,7 @@ InputDeckName: ; 1ad89 (6:6d89)
ld [wNamingScreenCursorY], a
ld a, $09
- ld [wd005], a
+ ld [wNamingScreenNumColumns], a
ld a, $07
ld [wNamingScreenKeyboardHeight], a
ld a, $0f
@@ -5523,7 +5523,7 @@ Func_1aefb: ; 1aefb (6:6efb)
.asm_6f2a
cp $06
jr z, .asm_6f73
- ld a, [wd005]
+ ld a, [wNamingScreenNumColumns]
ld c, a
ld a, h
bit 5, b
diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm
index f5a2826..7114b9e 100644
--- a/src/engine/bank07.asm
+++ b/src/engine/bank07.asm
@@ -118,11 +118,11 @@ LoadMapHeader: ; 1c33b (7:433b)
ld a, [hli]
ld c, a ; CGB tilemap variant
ld a, [hli]
- ld [wd28f], a
+ ld [wCurMapInitialPalette], a ; always 0?
ld a, [hli]
- ld [wd132], a
+ ld [wCurMapSGBPals], a
ld a, [hli]
- ld [wd290], a
+ ld [wCurMapPalette], a
ld a, [hli]
ld [wDefaultSong], a
@@ -751,8 +751,8 @@ SetNewScriptNPC: ; 1c768 (7:4768)
xor $02
ld [hl], a
call UpdateNPCAnimation
- ld a, $02
- farcall Func_c29b
+ ld a, 1 << RESTORE_FACING_DIRECTION
+ farcall SetOverworldNPCFlags
ld a, [wLoadedNPCTempIndex]
call GetLoadedNPCID
ld a, [hl]
@@ -1569,9 +1569,9 @@ Func_1cbcc: ; 1cbcc (7:4bcc)
call GetAnimCoordsAndFlags
ld a, [wd4b7]
- add -3
+ add LOW(Unknown_1cbfd)
ld e, a
- ld a, $4b
+ ld a, HIGH(Unknown_1cbfd)
adc 0
ld d, a
ld a, [de]
@@ -1586,9 +1586,8 @@ Func_1cbcc: ; 1cbcc (7:4bcc)
farcall Func_12ac9
ret
-; unreferenced data?
Unknown_1cbfd: ; 1cbfd (7:4bfd)
- db $f0, $f8, $00, $08, $f8, $f0
+ db -$10, -$8, $0, $8, -$8, -$10
Func_1cc03: ; 1cc03 (7:4c03)
ld a, [wDuelAnimDamage]
@@ -1640,7 +1639,7 @@ Func_1cc3e: ; 1cc3e (7:4c3e)
ld a, $03
ld [wd4b7], a
ld de, wAnimationQueue + 4
- ld a, $5b
+ ld a, SPRITE_ANIM_91
call Func_1cbcc
pop hl
ret
@@ -1650,7 +1649,7 @@ Func_1cc4e: ; 1cc4e (7:4c4e)
ld a, $04
ld [wd4b7], a
ld de, wAnimationQueue + 5
- ld a, $5a
+ ld a, SPRITE_ANIM_90
call Func_1cbcc
ld a, [wd4b8]
add $12
@@ -1663,7 +1662,7 @@ Func_1cc66: ; 1cc66 (7:4c66)
ld a, $05
ld [wd4b7], a
ld de, wAnimationQueue + 6
- ld a, $59
+ ld a, SPRITE_ANIM_89
call Func_1cbcc
pop hl
ret
@@ -2438,11 +2437,11 @@ PlayOpeningSequence: ; 1d335 (7:5335)
ld [hli], a ; x
ld a, 112
ld [hl], a ; y
- ld c, $be
+ ld c, SPRITE_ANIM_190
ld a, [wConsole]
cp CONSOLE_CGB
jr nz, .asm_1d3c5
- ld c, $bf
+ ld c, SPRITE_ANIM_191
.asm_1d3c5
ld a, c
ld bc, 60
@@ -2532,9 +2531,9 @@ AnimateRandomTitleScreenOrb: ; 1d614 (7:5614)
ld [hl], a ; SPRITE_ANIM_COORD_Y
ld a, [wConsole]
cp CONSOLE_CGB
- ld a, $d7
+ ld a, SPRITE_ANIM_215
jr nz, .start_anim
- ld a, $d8
+ ld a, SPRITE_ANIM_216
.start_anim
farcall StartSpriteAnimation
ret
diff --git a/src/engine/bank1c.asm b/src/engine/bank1c.asm
index 1ad86fc..d32928a 100644
--- a/src/engine/bank1c.asm
+++ b/src/engine/bank1c.asm
@@ -461,20 +461,20 @@ ENDM
border_medal_tile v0Tiles1 + $53a, $73, $10
border_medal_tile v0Tiles1 + $53c, $74, $10
-; decompresses palette data depending on wd132
+; decompresses palette data depending on wCurMapSGBPals
; then sends it as SGB packet
SetSGB2AndSGB3MapPalette: ; 7036a (1c:436a)
ld a, [wConsole]
cp CONSOLE_SGB
ret nz ; return if not SGB
- ld a, [wd132]
+ ld a, [wCurMapSGBPals]
or a
ret z ; not valid
push hl
push bc
push de
- ld a, [wd132]
+ ld a, [wCurMapSGBPals]
add a
ld c, a
ld b, $0
diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm
index cf18ca9..a8c03cc 100644
--- a/src/engine/bank20.asm
+++ b/src/engine/bank20.asm
@@ -45,11 +45,11 @@ LoadMapTilesAndPals: ; 8003d (20:403d)
ld [wVRAMTileOffset], a
ld a, [wd291]
ld [wd4cb], a
- ld a, [wd28f]
+ ld a, [wCurMapInitialPalette]
call SetBGPAndLoadedPal
ld a, [wd291]
ld [wd4cb], a
- ld a, [wd290]
+ ld a, [wCurMapPalette]
or a
jr z, .asm_80076
call SetBGPAndLoadedPal
@@ -143,7 +143,7 @@ LoadTilemap: ; 80082 (20:4082)
; since one "width" length goes to VRAM0
; and the other "width" length goes to VRAM1
push hl
- ld hl, wd28e
+ ld hl, wDecompressionRowWidth
ld a, [wBGMapWidth]
ld [hl], a
ld a, [wBGMapCGBMode]
@@ -168,7 +168,7 @@ LoadTilemap: ; 80082 (20:4082)
push bc
push de
ld b, $00
- ld a, [wd28e]
+ ld a, [wDecompressionRowWidth]
ld c, a
ld de, wDecompressionBuffer
call DecompressDataFromBank
@@ -402,7 +402,7 @@ LoadGraphicsPointerFromHL: ; 80229 (20:4229)
; unreferenced?
Func_80238: ; 80238 (20:4238)
push hl
- ld l, $2
+ ld l, $2 ; Tilesets
ld a, [wCurTileset]
call GetMapDataPointer
call LoadGraphicsPointerFromHL
@@ -425,7 +425,7 @@ Func_80238: ; 80238 (20:4238)
; a = number of tiles in sprite
Func_8025b: ; 8025b (20:425b)
push hl
- ld l, $4
+ ld l, $4 ; Sprites
call GetMapDataPointer
call LoadGraphicsPointerFromHL
ld a, [hl] ; sprite number of tiles
@@ -518,7 +518,7 @@ GetTileOffsetPointerAndSwitchVRAM_Tiles0ToTiles2: ; 802bb (20:42bb)
; loads tileset gfx to VRAM corresponding to wCurTileset
LoadTilesetGfx: ; 802d4 (20:42d4)
push hl
- ld l, $02
+ ld l, $02 ; Tilesets
ld a, [wCurTileset]
call GetMapDataPointer
call LoadGraphicsPointerFromHL
@@ -680,7 +680,7 @@ LoadTilesetGfx: ; 802d4 (20:42d4)
; gets pointer to BG map with ID from wCurTilemap
Func_803b9: ; 803b9 (20:43b9)
- ld l, $00
+ ld l, $00 ; Tilemaps
ld a, [wCurTilemap]
call GetMapDataPointer
call LoadGraphicsPointerFromHL
@@ -828,7 +828,7 @@ LoadPaletteDataToBuffer: ; 80456 (20:4456)
push hl
push bc
push de
- ld l, $08
+ ld l, $08 ; Palettes
call GetMapDataPointer
call LoadGraphicsPointerFromHL
@@ -1512,50 +1512,50 @@ Func_80cd7: ; 80cd7 (20:4cd7)
ret
.NPCSpriteAnimData
- db SPRITE_OW_PLAYER, $00, $1e ; $01
- db $ff, $00, $00 ; $02
- db SPRITE_OW_RONALD, $04, $0e ; $03
- db $ff, $00, $00 ; $04
- db SPRITE_OW_DRMASON, $00, $26 ; $05
- db SPRITE_OW_ISHIHARA, $04, $22 ; $06
- db SPRITE_OW_IMAKUNI, $00, $0e ; $07
- db SPRITE_OW_NIKKI, $00, $1a ; $08
- db SPRITE_OW_RICK, $00, $0e ; $09
- db SPRITE_OW_KEN, $04, $1e ; $0a
- db SPRITE_OW_AMY, $04, $0e ; $0b
- db SPRITE_OW_ISAAC, $00, $16 ; $0c
- db SPRITE_OW_MITCH, $00, $0e ; $0d
- db SPRITE_OW_GENE, $04, $22 ; $0e
- db SPRITE_OW_MURRAY, $00, $12 ; $0f
- db SPRITE_OW_COURTNEY, $00, $12 ; $10
- db $ff, $00, $00 ; $11
- db SPRITE_OW_STEVE, $00, $2a ; $12
- db $ff, $00, $00 ; $13
- db SPRITE_OW_JACK, $00, $26 ; $14
- db $ff, $00, $00 ; $15
- db SPRITE_OW_ROD, $00, $0e ; $16
- db $ff, $00, $00 ; $17
- db SPRITE_OW_BOY, $04, $16 ; $18
- db SPRITE_OW_LAD, $04, $1a ; $19
- db SPRITE_OW_SPECS, $00, $22 ; $1a
- db SPRITE_OW_BUTCH, $00, $16 ; $1b
- db SPRITE_OW_MANIA, $00, $26 ; $1c
- db SPRITE_OW_JOSHUA, $00, $26 ; $1d
- db SPRITE_OW_HOOD, $04, $1e ; $1e
- db SPRITE_OW_TECH, $00, $0e ; $1f
- db SPRITE_OW_CHAP, $00, $1a ; $20
- db SPRITE_OW_MAN, $00, $16 ; $21
- db SPRITE_OW_PAPPY, $00, $22 ; $22
- db SPRITE_OW_GIRL, $04, $0e ; $23
- db SPRITE_OW_LASS1, $04, $22 ; $24
- db SPRITE_OW_LASS2, $00, $1e ; $25
- db SPRITE_OW_LASS3, $04, $1a ; $26
- db SPRITE_OW_SWIMMER, $00, $16 ; $27
- db SPRITE_OW_CLERK, $0a, $30 ; $28
- db SPRITE_OW_GAL, $00, $16 ; $29
- db SPRITE_OW_WOMAN, $04, $1e ; $2a
- db SPRITE_OW_GRANNY, $00, $16 ; $2b
- db SPRITE_OW_AMY, $08, $2e ; $2c
+ db SPRITE_OW_PLAYER, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_RED_NPC_UP ; $01
+ db $ff, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_LIGHT_NPC_UP ; $02
+ db SPRITE_OW_RONALD, SPRITE_ANIM_DARK_NPC_UP, SPRITE_ANIM_BLUE_NPC_UP ; $03
+ db $ff, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_LIGHT_NPC_UP ; $04
+ db SPRITE_OW_DRMASON, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_WHITE_NPC_UP ; $05
+ db SPRITE_OW_ISHIHARA, SPRITE_ANIM_DARK_NPC_UP, SPRITE_ANIM_PURPLE_NPC_UP ; $06
+ db SPRITE_OW_IMAKUNI, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_BLUE_NPC_UP ; $07
+ db SPRITE_OW_NIKKI, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_GREEN_NPC_UP ; $08
+ db SPRITE_OW_RICK, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_BLUE_NPC_UP ; $09
+ db SPRITE_OW_KEN, SPRITE_ANIM_DARK_NPC_UP, SPRITE_ANIM_RED_NPC_UP ; $0a
+ db SPRITE_OW_AMY, SPRITE_ANIM_DARK_NPC_UP, SPRITE_ANIM_BLUE_NPC_UP ; $0b
+ db SPRITE_OW_ISAAC, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_YELLOW_NPC_UP ; $0c
+ db SPRITE_OW_MITCH, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_BLUE_NPC_UP ; $0d
+ db SPRITE_OW_GENE, SPRITE_ANIM_DARK_NPC_UP, SPRITE_ANIM_PURPLE_NPC_UP ; $0e
+ db SPRITE_OW_MURRAY, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_PINK_NPC_UP ; $0f
+ db SPRITE_OW_COURTNEY, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_PINK_NPC_UP ; $10
+ db $ff, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_LIGHT_NPC_UP ; $11
+ db SPRITE_OW_STEVE, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_INDIGO_NPC_UP ; $12
+ db $ff, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_LIGHT_NPC_UP ; $13
+ db SPRITE_OW_JACK, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_WHITE_NPC_UP ; $14
+ db $ff, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_LIGHT_NPC_UP ; $15
+ db SPRITE_OW_ROD, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_BLUE_NPC_UP ; $16
+ db $ff, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_LIGHT_NPC_UP ; $17
+ db SPRITE_OW_BOY, SPRITE_ANIM_DARK_NPC_UP, SPRITE_ANIM_YELLOW_NPC_UP ; $18
+ db SPRITE_OW_LAD, SPRITE_ANIM_DARK_NPC_UP, SPRITE_ANIM_GREEN_NPC_UP ; $19
+ db SPRITE_OW_SPECS, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_PURPLE_NPC_UP ; $1a
+ db SPRITE_OW_BUTCH, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_YELLOW_NPC_UP ; $1b
+ db SPRITE_OW_MANIA, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_WHITE_NPC_UP ; $1c
+ db SPRITE_OW_JOSHUA, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_WHITE_NPC_UP ; $1d
+ db SPRITE_OW_HOOD, SPRITE_ANIM_DARK_NPC_UP, SPRITE_ANIM_RED_NPC_UP ; $1e
+ db SPRITE_OW_TECH, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_BLUE_NPC_UP ; $1f
+ db SPRITE_OW_CHAP, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_GREEN_NPC_UP ; $20
+ db SPRITE_OW_MAN, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_YELLOW_NPC_UP ; $21
+ db SPRITE_OW_PAPPY, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_PURPLE_NPC_UP ; $22
+ db SPRITE_OW_GIRL, SPRITE_ANIM_DARK_NPC_UP, SPRITE_ANIM_BLUE_NPC_UP ; $23
+ db SPRITE_OW_LASS1, SPRITE_ANIM_DARK_NPC_UP, SPRITE_ANIM_PURPLE_NPC_UP ; $24
+ db SPRITE_OW_LASS2, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_RED_NPC_UP ; $25
+ db SPRITE_OW_LASS3, SPRITE_ANIM_DARK_NPC_UP, SPRITE_ANIM_GREEN_NPC_UP ; $26
+ db SPRITE_OW_SWIMMER, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_YELLOW_NPC_UP ; $27
+ db SPRITE_OW_CLERK, SPRITE_ANIM_SGB_CLERK_NPC_UP, SPRITE_ANIM_CGB_CLERK_NPC_UP ; $28
+ db SPRITE_OW_GAL, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_YELLOW_NPC_UP ; $29
+ db SPRITE_OW_WOMAN, SPRITE_ANIM_DARK_NPC_UP, SPRITE_ANIM_RED_NPC_UP ; $2a
+ db SPRITE_OW_GRANNY, SPRITE_ANIM_LIGHT_NPC_UP, SPRITE_ANIM_YELLOW_NPC_UP ; $2b
+ db SPRITE_OW_AMY, SPRITE_ANIM_SGB_AMY_LAYING, SPRITE_ANIM_CGB_AMY_LAYING ; $2c
SpriteNullAnimationPointer: ; 80e5a (20:4e5a)
dw SpriteNullAnimationFrame
@@ -1567,9 +1567,9 @@ SpriteNullAnimationFrame:
MapDataPointers: ; 80e5d (20:4e5d)
dw Tilemaps
dw Tilesets
- dw MapDataPointers_8116b
- dw SpriteAnimationPointers
- dw MapDataPointers_81697
+ dw Sprites
+ dw SpriteAnimations
+ dw Palettes
; \1 = pointer
; \2 = tileset
@@ -1785,11 +1785,11 @@ Tilesets: ; 8100f (20:500f)
; \1 = gfx pointer
; \2 = number of tiles
gfx_pointer: MACRO
- dwb \1, BANK(\1) - BANK(MapDataPointers_8116b)
+ dwb \1, BANK(\1) - BANK(Sprites)
db \2
ENDM
-MapDataPointers_8116b: ; 8116b (20:516b)
+Sprites: ; 8116b (20:516b)
gfx_pointer OWPlayerGfx, $14 ; SPRITE_OW_PLAYER
gfx_pointer OWRonaldGfx, $14 ; SPRITE_OW_RONALD
gfx_pointer OWDrMasonGfx, $14 ; SPRITE_OW_DRMASON
@@ -1907,238 +1907,238 @@ MapDataPointers_8116b: ; 8116b (20:516b)
; \1 = anim data pointer
anim_data_pointer: MACRO
- dwb \1, BANK(\1) - BANK(SpriteAnimationPointers)
+ dwb \1, BANK(\1) - BANK(SpriteAnimations)
db $00 ; unused (padding?)
ENDM
-SpriteAnimationPointers: ; 81333 (20:5333)
- anim_data_pointer AnimData0 ; $00
- anim_data_pointer AnimData1 ; $01
- anim_data_pointer AnimData2 ; $02
- anim_data_pointer AnimData3 ; $03
- anim_data_pointer AnimData4 ; $04
- anim_data_pointer AnimData5 ; $05
- anim_data_pointer AnimData6 ; $06
- anim_data_pointer AnimData7 ; $07
- anim_data_pointer AnimData8 ; $08
- anim_data_pointer AnimData9 ; $09
- anim_data_pointer AnimData10 ; $0a
- anim_data_pointer AnimData11 ; $0b
- anim_data_pointer AnimData12 ; $0c
- anim_data_pointer AnimData13 ; $0d
- anim_data_pointer AnimData14 ; $0e
- anim_data_pointer AnimData15 ; $0f
- anim_data_pointer AnimData16 ; $10
- anim_data_pointer AnimData17 ; $11
- anim_data_pointer AnimData18 ; $12
- anim_data_pointer AnimData19 ; $13
- anim_data_pointer AnimData20 ; $14
- anim_data_pointer AnimData21 ; $15
- anim_data_pointer AnimData22 ; $16
- anim_data_pointer AnimData23 ; $17
- anim_data_pointer AnimData24 ; $18
- anim_data_pointer AnimData25 ; $19
- anim_data_pointer AnimData26 ; $1a
- anim_data_pointer AnimData27 ; $1b
- anim_data_pointer AnimData28 ; $1c
- anim_data_pointer AnimData29 ; $1d
- anim_data_pointer AnimData30 ; $1e
- anim_data_pointer AnimData31 ; $1f
- anim_data_pointer AnimData32 ; $20
- anim_data_pointer AnimData33 ; $21
- anim_data_pointer AnimData34 ; $22
- anim_data_pointer AnimData35 ; $23
- anim_data_pointer AnimData36 ; $24
- anim_data_pointer AnimData37 ; $25
- anim_data_pointer AnimData38 ; $26
- anim_data_pointer AnimData39 ; $27
- anim_data_pointer AnimData40 ; $28
- anim_data_pointer AnimData41 ; $29
- anim_data_pointer AnimData42 ; $2a
- anim_data_pointer AnimData43 ; $2b
- anim_data_pointer AnimData44 ; $2c
- anim_data_pointer AnimData45 ; $2d
- anim_data_pointer AnimData46 ; $2e
- anim_data_pointer AnimData47 ; $2f
- anim_data_pointer AnimData48 ; $30
- anim_data_pointer AnimData49 ; $31
- anim_data_pointer AnimData50 ; $32
- anim_data_pointer AnimData51 ; $33
- anim_data_pointer AnimData52 ; $34
- anim_data_pointer AnimData53 ; $35
- anim_data_pointer AnimData54 ; $36
- anim_data_pointer AnimData55 ; $37
- anim_data_pointer AnimData56 ; $38
- anim_data_pointer AnimData57 ; $39
- anim_data_pointer AnimData58 ; $3a
- anim_data_pointer AnimData59 ; $3b
- anim_data_pointer AnimData60 ; $3c
- anim_data_pointer AnimData61 ; $3d
- anim_data_pointer AnimData62 ; $3e
- anim_data_pointer AnimData63 ; $3f
- anim_data_pointer AnimData64 ; $40
- anim_data_pointer AnimData65 ; $41
- anim_data_pointer AnimData66 ; $42
- anim_data_pointer AnimData67 ; $43
- anim_data_pointer AnimData68 ; $44
- anim_data_pointer AnimData69 ; $45
- anim_data_pointer AnimData70 ; $46
- anim_data_pointer AnimData71 ; $47
- anim_data_pointer AnimData72 ; $48
- anim_data_pointer AnimData73 ; $49
- anim_data_pointer AnimData74 ; $4a
- anim_data_pointer AnimData75 ; $4b
- anim_data_pointer AnimData76 ; $4c
- anim_data_pointer AnimData77 ; $4d
- anim_data_pointer AnimData78 ; $4e
- anim_data_pointer AnimData79 ; $4f
- anim_data_pointer AnimData80 ; $50
- anim_data_pointer AnimData81 ; $51
- anim_data_pointer AnimData82 ; $52
- anim_data_pointer AnimData83 ; $53
- anim_data_pointer AnimData84 ; $54
- anim_data_pointer AnimData85 ; $55
- anim_data_pointer AnimData86 ; $56
- anim_data_pointer AnimData87 ; $57
- anim_data_pointer AnimData88 ; $58
- anim_data_pointer AnimData89 ; $59
- anim_data_pointer AnimData90 ; $5a
- anim_data_pointer AnimData91 ; $5b
- anim_data_pointer AnimData92 ; $5c
- anim_data_pointer AnimData93 ; $5d
- anim_data_pointer AnimData94 ; $5e
- anim_data_pointer AnimData95 ; $5f
- anim_data_pointer AnimData96 ; $60
- anim_data_pointer AnimData97 ; $61
- anim_data_pointer AnimData98 ; $62
- anim_data_pointer AnimData99 ; $63
- anim_data_pointer AnimData100 ; $64
- anim_data_pointer AnimData101 ; $65
- anim_data_pointer AnimData102 ; $66
- anim_data_pointer AnimData103 ; $67
- anim_data_pointer AnimData104 ; $68
- anim_data_pointer AnimData105 ; $69
- anim_data_pointer AnimData106 ; $6a
- anim_data_pointer AnimData107 ; $6b
- anim_data_pointer AnimData108 ; $6c
- anim_data_pointer AnimData109 ; $6d
- anim_data_pointer AnimData110 ; $6e
- anim_data_pointer AnimData111 ; $6f
- anim_data_pointer AnimData112 ; $70
- anim_data_pointer AnimData113 ; $71
- anim_data_pointer AnimData114 ; $72
- anim_data_pointer AnimData115 ; $73
- anim_data_pointer AnimData116 ; $74
- anim_data_pointer AnimData117 ; $75
- anim_data_pointer AnimData118 ; $76
- anim_data_pointer AnimData119 ; $77
- anim_data_pointer AnimData120 ; $78
- anim_data_pointer AnimData121 ; $79
- anim_data_pointer AnimData122 ; $7a
- anim_data_pointer AnimData123 ; $7b
- anim_data_pointer AnimData124 ; $7c
- anim_data_pointer AnimData125 ; $7d
- anim_data_pointer AnimData126 ; $7e
- anim_data_pointer AnimData127 ; $7f
- anim_data_pointer AnimData128 ; $80
- anim_data_pointer AnimData129 ; $81
- anim_data_pointer AnimData130 ; $82
- anim_data_pointer AnimData131 ; $83
- anim_data_pointer AnimData132 ; $84
- anim_data_pointer AnimData133 ; $85
- anim_data_pointer AnimData134 ; $86
- anim_data_pointer AnimData135 ; $87
- anim_data_pointer AnimData136 ; $88
- anim_data_pointer AnimData137 ; $89
- anim_data_pointer AnimData138 ; $8a
- anim_data_pointer AnimData139 ; $8b
- anim_data_pointer AnimData140 ; $8c
- anim_data_pointer AnimData141 ; $8d
- anim_data_pointer AnimData142 ; $8e
- anim_data_pointer AnimData143 ; $8f
- anim_data_pointer AnimData144 ; $90
- anim_data_pointer AnimData145 ; $91
- anim_data_pointer AnimData146 ; $92
- anim_data_pointer AnimData147 ; $93
- anim_data_pointer AnimData148 ; $94
- anim_data_pointer AnimData149 ; $95
- anim_data_pointer AnimData150 ; $96
- anim_data_pointer AnimData151 ; $97
- anim_data_pointer AnimData152 ; $98
- anim_data_pointer AnimData153 ; $99
- anim_data_pointer AnimData154 ; $9a
- anim_data_pointer AnimData155 ; $9b
- anim_data_pointer AnimData156 ; $9c
- anim_data_pointer AnimData157 ; $9d
- anim_data_pointer AnimData158 ; $9e
- anim_data_pointer AnimData159 ; $9f
- anim_data_pointer AnimData160 ; $a0
- anim_data_pointer AnimData161 ; $a1
- anim_data_pointer AnimData162 ; $a2
- anim_data_pointer AnimData163 ; $a3
- anim_data_pointer AnimData164 ; $a4
- anim_data_pointer AnimData165 ; $a5
- anim_data_pointer AnimData166 ; $a6
- anim_data_pointer AnimData167 ; $a7
- anim_data_pointer AnimData168 ; $a8
- anim_data_pointer AnimData169 ; $a9
- anim_data_pointer AnimData170 ; $aa
- anim_data_pointer AnimData171 ; $ab
- anim_data_pointer AnimData172 ; $ac
- anim_data_pointer AnimData173 ; $ad
- anim_data_pointer AnimData174 ; $ae
- anim_data_pointer AnimData175 ; $af
- anim_data_pointer AnimData176 ; $b0
- anim_data_pointer AnimData177 ; $b1
- anim_data_pointer AnimData178 ; $b2
- anim_data_pointer AnimData179 ; $b3
- anim_data_pointer AnimData180 ; $b4
- anim_data_pointer AnimData181 ; $b5
- anim_data_pointer AnimData182 ; $b6
- anim_data_pointer AnimData183 ; $b7
- anim_data_pointer AnimData184 ; $b8
- anim_data_pointer AnimData185 ; $b9
- anim_data_pointer AnimData186 ; $ba
- anim_data_pointer AnimData187 ; $bb
- anim_data_pointer AnimData188 ; $bc
- anim_data_pointer AnimData189 ; $bd
- anim_data_pointer AnimData190 ; $be
- anim_data_pointer AnimData191 ; $bf
- anim_data_pointer AnimData192 ; $c0
- anim_data_pointer AnimData193 ; $c1
- anim_data_pointer AnimData194 ; $c2
- anim_data_pointer AnimData195 ; $c3
- anim_data_pointer AnimData196 ; $c4
- anim_data_pointer AnimData197 ; $c5
- anim_data_pointer AnimData198 ; $c6
- anim_data_pointer AnimData199 ; $c7
- anim_data_pointer AnimData200 ; $c8
- anim_data_pointer AnimData201 ; $c9
- anim_data_pointer AnimData202 ; $ca
- anim_data_pointer AnimData203 ; $cb
- anim_data_pointer AnimData204 ; $cc
- anim_data_pointer AnimData205 ; $cd
- anim_data_pointer AnimData206 ; $ce
- anim_data_pointer AnimData207 ; $cf
- anim_data_pointer AnimData208 ; $d0
- anim_data_pointer AnimData209 ; $d1
- anim_data_pointer AnimData210 ; $d2
- anim_data_pointer AnimData211 ; $d3
- anim_data_pointer AnimData212 ; $d4
- anim_data_pointer AnimData213 ; $d5
- anim_data_pointer AnimData214 ; $d6
- anim_data_pointer AnimData215 ; $d7
- anim_data_pointer AnimData216 ; $d8
+SpriteAnimations: ; 81333 (20:5333)
+ anim_data_pointer AnimData0 ; SPRITE_ANIM_LIGHT_NPC_UP
+ anim_data_pointer AnimData1 ; SPRITE_ANIM_LIGHT_NPC_RIGHT
+ anim_data_pointer AnimData2 ; SPRITE_ANIM_LIGHT_NPC_DOWN
+ anim_data_pointer AnimData3 ; SPRITE_ANIM_LIGHT_NPC_LEFT
+ anim_data_pointer AnimData4 ; SPRITE_ANIM_DARK_NPC_UP
+ anim_data_pointer AnimData5 ; SPRITE_ANIM_DARK_NPC_RIGHT
+ anim_data_pointer AnimData6 ; SPRITE_ANIM_DARK_NPC_DOWN
+ anim_data_pointer AnimData7 ; SPRITE_ANIM_DARK_NPC_LEFT
+ anim_data_pointer AnimData8 ; SPRITE_ANIM_SGB_AMY_LAYING
+ anim_data_pointer AnimData9 ; SPRITE_ANIM_SGB_AMY_STAND
+ anim_data_pointer AnimData10 ; SPRITE_ANIM_SGB_CLERK_NPC_UP
+ anim_data_pointer AnimData11 ; SPRITE_ANIM_SGB_CLERK_NPC_RIGHT
+ anim_data_pointer AnimData12 ; SPRITE_ANIM_SGB_CLERK_NPC_DOWN
+ anim_data_pointer AnimData13 ; SPRITE_ANIM_SGB_CLERK_NPC_LEFT
+ anim_data_pointer AnimData14 ; SPRITE_ANIM_BLUE_NPC_UP
+ anim_data_pointer AnimData15 ; SPRITE_ANIM_BLUE_NPC_RIGHT
+ anim_data_pointer AnimData16 ; SPRITE_ANIM_BLUE_NPC_DOWN
+ anim_data_pointer AnimData17 ; SPRITE_ANIM_BLUE_NPC_LEFT
+ anim_data_pointer AnimData18 ; SPRITE_ANIM_PINK_NPC_UP
+ anim_data_pointer AnimData19 ; SPRITE_ANIM_PINK_NPC_RIGHT
+ anim_data_pointer AnimData20 ; SPRITE_ANIM_PINK_NPC_DOWN
+ anim_data_pointer AnimData21 ; SPRITE_ANIM_PINK_NPC_LEFT
+ anim_data_pointer AnimData22 ; SPRITE_ANIM_YELLOW_NPC_UP
+ anim_data_pointer AnimData23 ; SPRITE_ANIM_YELLOW_NPC_RIGHT
+ anim_data_pointer AnimData24 ; SPRITE_ANIM_YELLOW_NPC_DOWN
+ anim_data_pointer AnimData25 ; SPRITE_ANIM_YELLOW_NPC_LEFT
+ anim_data_pointer AnimData26 ; SPRITE_ANIM_GREEN_NPC_UP
+ anim_data_pointer AnimData27 ; SPRITE_ANIM_GREEN_NPC_RIGHT
+ anim_data_pointer AnimData28 ; SPRITE_ANIM_GREEN_NPC_DOWN
+ anim_data_pointer AnimData29 ; SPRITE_ANIM_GREEN_NPC_LEFT
+ anim_data_pointer AnimData30 ; SPRITE_ANIM_RED_NPC_UP
+ anim_data_pointer AnimData31 ; SPRITE_ANIM_RED_NPC_RIGHT
+ anim_data_pointer AnimData32 ; SPRITE_ANIM_RED_NPC_DOWN
+ anim_data_pointer AnimData33 ; SPRITE_ANIM_RED_NPC_LEFT
+ anim_data_pointer AnimData34 ; SPRITE_ANIM_PURPLE_NPC_UP
+ anim_data_pointer AnimData35 ; SPRITE_ANIM_PURPLE_NPC_RIGHT
+ anim_data_pointer AnimData36 ; SPRITE_ANIM_PURPLE_NPC_DOWN
+ anim_data_pointer AnimData37 ; SPRITE_ANIM_PURPLE_NPC_LEFT
+ anim_data_pointer AnimData38 ; SPRITE_ANIM_WHITE_NPC_UP
+ anim_data_pointer AnimData39 ; SPRITE_ANIM_WHITE_NPC_RIGHT
+ anim_data_pointer AnimData40 ; SPRITE_ANIM_WHITE_NPC_DOWN
+ anim_data_pointer AnimData41 ; SPRITE_ANIM_WHITE_NPC_LEFT
+ anim_data_pointer AnimData42 ; SPRITE_ANIM_INDIGO_NPC_UP
+ anim_data_pointer AnimData43 ; SPRITE_ANIM_INDIGO_NPC_RIGHT
+ anim_data_pointer AnimData44 ; SPRITE_ANIM_INDIGO_NPC_DOWN
+ anim_data_pointer AnimData45 ; SPRITE_ANIM_INDIGO_NPC_LEFT
+ anim_data_pointer AnimData46 ; SPRITE_ANIM_CGB_AMY_LAYING
+ anim_data_pointer AnimData47 ; SPRITE_ANIM_CGB_AMY_STAND
+ anim_data_pointer AnimData48 ; SPRITE_ANIM_CGB_CLERK_NPC_UP
+ anim_data_pointer AnimData49 ; SPRITE_ANIM_CGB_CLERK_NPC_RIGHT
+ anim_data_pointer AnimData50 ; SPRITE_ANIM_CGB_CLERK_NPC_DOWN
+ anim_data_pointer AnimData51 ; SPRITE_ANIM_CGB_CLERK_NPC_LEFT
+ anim_data_pointer AnimData52 ; SPRITE_ANIM_SGB_VOLCANO_SMOKE
+ anim_data_pointer AnimData53 ; SPRITE_ANIM_SGB_OWMAP_CURSOR
+ anim_data_pointer AnimData54 ; SPRITE_ANIM_SGB_OWMAP_CURSOR_FAST
+ anim_data_pointer AnimData55 ; SPRITE_ANIM_CGB_VOLCANO_SMOKE
+ anim_data_pointer AnimData56 ; SPRITE_ANIM_CGB_OWMAP_CURSOR
+ anim_data_pointer AnimData57 ; SPRITE_ANIM_CGB_OWMAP_CURSOR_FAST
+ anim_data_pointer AnimData58 ; SPRITE_ANIM_TORCH
+ anim_data_pointer AnimData59 ; SPRITE_ANIM_SGB_CARD_TOP_LEFT
+ anim_data_pointer AnimData60 ; SPRITE_ANIM_SGB_CARD_TOP_RIGHT
+ anim_data_pointer AnimData61 ; SPRITE_ANIM_SGB_CARD_LEFT_SPARK
+ anim_data_pointer AnimData62 ; SPRITE_ANIM_SGB_CARD_BOTTOM_LEFT
+ anim_data_pointer AnimData63 ; SPRITE_ANIM_SGB_CARD_BOTTOM_RIGHT
+ anim_data_pointer AnimData64 ; SPRITE_ANIM_SGB_CARD_RIGHT_SPARK
+ anim_data_pointer AnimData65 ; SPRITE_ANIM_CGB_CARD_TOP_LEFT
+ anim_data_pointer AnimData66 ; SPRITE_ANIM_CGB_CARD_TOP_RIGHT
+ anim_data_pointer AnimData67 ; SPRITE_ANIM_CGB_CARD_LEFT_SPARK
+ anim_data_pointer AnimData68 ; SPRITE_ANIM_CGB_CARD_BOTTOM_LEFT
+ anim_data_pointer AnimData69 ; SPRITE_ANIM_CGB_CARD_BOTTOM_RIGHT
+ anim_data_pointer AnimData70 ; SPRITE_ANIM_CGB_CARD_RIGHT_SPARK
+ anim_data_pointer AnimData71 ; SPRITE_ANIM_71
+ anim_data_pointer AnimData72 ; SPRITE_ANIM_72
+ anim_data_pointer AnimData73 ; SPRITE_ANIM_73
+ anim_data_pointer AnimData74 ; SPRITE_ANIM_74
+ anim_data_pointer AnimData75 ; SPRITE_ANIM_75
+ anim_data_pointer AnimData76 ; SPRITE_ANIM_76
+ anim_data_pointer AnimData77 ; SPRITE_ANIM_77
+ anim_data_pointer AnimData78 ; SPRITE_ANIM_78
+ anim_data_pointer AnimData79 ; SPRITE_ANIM_79
+ anim_data_pointer AnimData80 ; SPRITE_ANIM_80
+ anim_data_pointer AnimData81 ; SPRITE_ANIM_81
+ anim_data_pointer AnimData82 ; SPRITE_ANIM_82
+ anim_data_pointer AnimData83 ; SPRITE_ANIM_83
+ anim_data_pointer AnimData84 ; SPRITE_ANIM_84
+ anim_data_pointer AnimData85 ; SPRITE_ANIM_85
+ anim_data_pointer AnimData86 ; SPRITE_ANIM_86
+ anim_data_pointer AnimData87 ; SPRITE_ANIM_87
+ anim_data_pointer AnimData88 ; SPRITE_ANIM_88
+ anim_data_pointer AnimData89 ; SPRITE_ANIM_89
+ anim_data_pointer AnimData90 ; SPRITE_ANIM_90
+ anim_data_pointer AnimData91 ; SPRITE_ANIM_91
+ anim_data_pointer AnimData92 ; SPRITE_ANIM_92
+ anim_data_pointer AnimData93 ; SPRITE_ANIM_93
+ anim_data_pointer AnimData94 ; SPRITE_ANIM_94
+ anim_data_pointer AnimData95 ; SPRITE_ANIM_95
+ anim_data_pointer AnimData96 ; SPRITE_ANIM_96
+ anim_data_pointer AnimData97 ; SPRITE_ANIM_97
+ anim_data_pointer AnimData98 ; SPRITE_ANIM_98
+ anim_data_pointer AnimData99 ; SPRITE_ANIM_99
+ anim_data_pointer AnimData100 ; SPRITE_ANIM_100
+ anim_data_pointer AnimData101 ; SPRITE_ANIM_101
+ anim_data_pointer AnimData102 ; SPRITE_ANIM_102
+ anim_data_pointer AnimData103 ; SPRITE_ANIM_103
+ anim_data_pointer AnimData104 ; SPRITE_ANIM_104
+ anim_data_pointer AnimData105 ; SPRITE_ANIM_105
+ anim_data_pointer AnimData106 ; SPRITE_ANIM_106
+ anim_data_pointer AnimData107 ; SPRITE_ANIM_107
+ anim_data_pointer AnimData108 ; SPRITE_ANIM_108
+ anim_data_pointer AnimData109 ; SPRITE_ANIM_109
+ anim_data_pointer AnimData110 ; SPRITE_ANIM_110
+ anim_data_pointer AnimData111 ; SPRITE_ANIM_111
+ anim_data_pointer AnimData112 ; SPRITE_ANIM_112
+ anim_data_pointer AnimData113 ; SPRITE_ANIM_113
+ anim_data_pointer AnimData114 ; SPRITE_ANIM_114
+ anim_data_pointer AnimData115 ; SPRITE_ANIM_115
+ anim_data_pointer AnimData116 ; SPRITE_ANIM_116
+ anim_data_pointer AnimData117 ; SPRITE_ANIM_117
+ anim_data_pointer AnimData118 ; SPRITE_ANIM_118
+ anim_data_pointer AnimData119 ; SPRITE_ANIM_119
+ anim_data_pointer AnimData120 ; SPRITE_ANIM_120
+ anim_data_pointer AnimData121 ; SPRITE_ANIM_121
+ anim_data_pointer AnimData122 ; SPRITE_ANIM_122
+ anim_data_pointer AnimData123 ; SPRITE_ANIM_123
+ anim_data_pointer AnimData124 ; SPRITE_ANIM_124
+ anim_data_pointer AnimData125 ; SPRITE_ANIM_125
+ anim_data_pointer AnimData126 ; SPRITE_ANIM_126
+ anim_data_pointer AnimData127 ; SPRITE_ANIM_127
+ anim_data_pointer AnimData128 ; SPRITE_ANIM_128
+ anim_data_pointer AnimData129 ; SPRITE_ANIM_129
+ anim_data_pointer AnimData130 ; SPRITE_ANIM_130
+ anim_data_pointer AnimData131 ; SPRITE_ANIM_131
+ anim_data_pointer AnimData132 ; SPRITE_ANIM_132
+ anim_data_pointer AnimData133 ; SPRITE_ANIM_133
+ anim_data_pointer AnimData134 ; SPRITE_ANIM_134
+ anim_data_pointer AnimData135 ; SPRITE_ANIM_135
+ anim_data_pointer AnimData136 ; SPRITE_ANIM_136
+ anim_data_pointer AnimData137 ; SPRITE_ANIM_137
+ anim_data_pointer AnimData138 ; SPRITE_ANIM_138
+ anim_data_pointer AnimData139 ; SPRITE_ANIM_139
+ anim_data_pointer AnimData140 ; SPRITE_ANIM_140
+ anim_data_pointer AnimData141 ; SPRITE_ANIM_141
+ anim_data_pointer AnimData142 ; SPRITE_ANIM_142
+ anim_data_pointer AnimData143 ; SPRITE_ANIM_143
+ anim_data_pointer AnimData144 ; SPRITE_ANIM_144
+ anim_data_pointer AnimData145 ; SPRITE_ANIM_145
+ anim_data_pointer AnimData146 ; SPRITE_ANIM_146
+ anim_data_pointer AnimData147 ; SPRITE_ANIM_147
+ anim_data_pointer AnimData148 ; SPRITE_ANIM_148
+ anim_data_pointer AnimData149 ; SPRITE_ANIM_149
+ anim_data_pointer AnimData150 ; SPRITE_ANIM_150
+ anim_data_pointer AnimData151 ; SPRITE_ANIM_151
+ anim_data_pointer AnimData152 ; SPRITE_ANIM_152
+ anim_data_pointer AnimData153 ; SPRITE_ANIM_153
+ anim_data_pointer AnimData154 ; SPRITE_ANIM_154
+ anim_data_pointer AnimData155 ; SPRITE_ANIM_155
+ anim_data_pointer AnimData156 ; SPRITE_ANIM_156
+ anim_data_pointer AnimData157 ; SPRITE_ANIM_157
+ anim_data_pointer AnimData158 ; SPRITE_ANIM_158
+ anim_data_pointer AnimData159 ; SPRITE_ANIM_159
+ anim_data_pointer AnimData160 ; SPRITE_ANIM_160
+ anim_data_pointer AnimData161 ; SPRITE_ANIM_161
+ anim_data_pointer AnimData162 ; SPRITE_ANIM_162
+ anim_data_pointer AnimData163 ; SPRITE_ANIM_163
+ anim_data_pointer AnimData164 ; SPRITE_ANIM_164
+ anim_data_pointer AnimData165 ; SPRITE_ANIM_165
+ anim_data_pointer AnimData166 ; SPRITE_ANIM_166
+ anim_data_pointer AnimData167 ; SPRITE_ANIM_167
+ anim_data_pointer AnimData168 ; SPRITE_ANIM_168
+ anim_data_pointer AnimData169 ; SPRITE_ANIM_169
+ anim_data_pointer AnimData170 ; SPRITE_ANIM_170
+ anim_data_pointer AnimData171 ; SPRITE_ANIM_171
+ anim_data_pointer AnimData172 ; SPRITE_ANIM_172
+ anim_data_pointer AnimData173 ; SPRITE_ANIM_173
+ anim_data_pointer AnimData174 ; SPRITE_ANIM_174
+ anim_data_pointer AnimData175 ; SPRITE_ANIM_175
+ anim_data_pointer AnimData176 ; SPRITE_ANIM_176
+ anim_data_pointer AnimData177 ; SPRITE_ANIM_177
+ anim_data_pointer AnimData178 ; SPRITE_ANIM_178
+ anim_data_pointer AnimData179 ; SPRITE_ANIM_179
+ anim_data_pointer AnimData180 ; SPRITE_ANIM_180
+ anim_data_pointer AnimData181 ; SPRITE_ANIM_181
+ anim_data_pointer AnimData182 ; SPRITE_ANIM_182
+ anim_data_pointer AnimData183 ; SPRITE_ANIM_183
+ anim_data_pointer AnimData184 ; SPRITE_ANIM_184
+ anim_data_pointer AnimData185 ; SPRITE_ANIM_185
+ anim_data_pointer AnimData186 ; SPRITE_ANIM_186
+ anim_data_pointer AnimData187 ; SPRITE_ANIM_187
+ anim_data_pointer AnimData188 ; SPRITE_ANIM_188
+ anim_data_pointer AnimData189 ; SPRITE_ANIM_189
+ anim_data_pointer AnimData190 ; SPRITE_ANIM_190
+ anim_data_pointer AnimData191 ; SPRITE_ANIM_191
+ anim_data_pointer AnimData192 ; SPRITE_ANIM_192
+ anim_data_pointer AnimData193 ; SPRITE_ANIM_193
+ anim_data_pointer AnimData194 ; SPRITE_ANIM_194
+ anim_data_pointer AnimData195 ; SPRITE_ANIM_195
+ anim_data_pointer AnimData196 ; SPRITE_ANIM_196
+ anim_data_pointer AnimData197 ; SPRITE_ANIM_197
+ anim_data_pointer AnimData198 ; SPRITE_ANIM_198
+ anim_data_pointer AnimData199 ; SPRITE_ANIM_199
+ anim_data_pointer AnimData200 ; SPRITE_ANIM_200
+ anim_data_pointer AnimData201 ; SPRITE_ANIM_201
+ anim_data_pointer AnimData202 ; SPRITE_ANIM_202
+ anim_data_pointer AnimData203 ; SPRITE_ANIM_203
+ anim_data_pointer AnimData204 ; SPRITE_ANIM_204
+ anim_data_pointer AnimData205 ; SPRITE_ANIM_205
+ anim_data_pointer AnimData206 ; SPRITE_ANIM_206
+ anim_data_pointer AnimData207 ; SPRITE_ANIM_207
+ anim_data_pointer AnimData208 ; SPRITE_ANIM_208
+ anim_data_pointer AnimData209 ; SPRITE_ANIM_209
+ anim_data_pointer AnimData210 ; SPRITE_ANIM_210
+ anim_data_pointer AnimData211 ; SPRITE_ANIM_211
+ anim_data_pointer AnimData212 ; SPRITE_ANIM_212
+ anim_data_pointer AnimData213 ; SPRITE_ANIM_213
+ anim_data_pointer AnimData214 ; SPRITE_ANIM_214
+ anim_data_pointer AnimData215 ; SPRITE_ANIM_215
+ anim_data_pointer AnimData216 ; SPRITE_ANIM_216
; \1 = palette pointer
; \2 = number of palettes
; \3 = number of OBJ colors
palette_pointer: MACRO
- dwb \1, BANK(\1) - BANK(MapDataPointers_81697)
+ dwb \1, BANK(\1) - BANK(Palettes)
db (\2 << 4) + \3
ENDM
-MapDataPointers_81697: ; 81697 (20:5697)
+Palettes: ; 81697 (20:5697)
palette_pointer Palette0, 8, 1 ; PALETTE_0
palette_pointer Palette1, 8, 0 ; PALETTE_1
palette_pointer Palette2, 8, 0 ; PALETTE_2
diff --git a/src/engine/home.asm b/src/engine/home.asm
index cb77945..a79cd14 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -9082,10 +9082,10 @@ TryExecuteEffectCommandFunction: ; 2fd9 (0:2fd9)
ret
.execute_function
- ; execute the function at [wce22]:hl
+ ; execute the function at [wEffectFunctionsBank]:hl
ldh a, [hBankROM]
push af
- ld a, [wce22]
+ ld a, [wEffectFunctionsBank]
call BankswitchROM
or a
call CallHL
@@ -9116,9 +9116,9 @@ CheckMatchingCommand: ; 2ffe (0:2ffe)
push af
ld a, BANK(EffectCommands)
call BankswitchROM
- ; store the bank number of command functions ($b) in wce22
- ld a, $b
- ld [wce22], a
+ ; store the bank number of command functions ($b) in wEffectFunctionsBank
+ ld a, BANK("Effect Functions")
+ ld [wEffectFunctionsBank], a
.check_command_loop
ld a, [hli]
or a
@@ -10601,8 +10601,8 @@ Func_37c5: ; 37c5 (0:37c5)
ret
OverworldDoFrameFunction: ; 380e (0:380e)
- ld a, [wd0c1]
- bit 7, a
+ ld a, [wOverworldNPCFlags]
+ bit HIDE_ALL_NPC_SPRITES, a
ret nz
ldh a, [hBankROM]
push af
@@ -10670,7 +10670,7 @@ GameEvent_GiftCenter: ; 3876 (0:3876)
ld a, MUSIC_CARD_POP
call PlaySong
ld a, GAME_EVENT_GIFT_CENTER
- ld [wd0c2], a
+ ld [wActiveGameEvent], a
ld a, [wd10e]
or $10
ld [wd10e], a
@@ -10686,9 +10686,9 @@ GameEvent_GiftCenter: ; 3876 (0:3876)
GameEvent_BattleCenter: ; 38a3 (0:38a3)
ld a, GAME_EVENT_BATTLE_CENTER
- ld [wd0c2], a
+ ld [wActiveGameEvent], a
xor a
- ld [wd112], a
+ ld [wSongOverride], a
ld a, -1
ld [wDuelResult], a
ld a, MUSIC_DUEL_THEME_1
@@ -10701,9 +10701,9 @@ GameEvent_BattleCenter: ; 38a3 (0:38a3)
GameEvent_Duel: ; 38c0 (0:38c0)
ld a, GAME_EVENT_DUEL
- ld [wd0c2], a
+ ld [wActiveGameEvent], a
xor a
- ld [wd112], a
+ ld [wSongOverride], a
call EnableSRAM
xor a
ld [sPlayerInChallengeMachine], a
@@ -10731,7 +10731,7 @@ GameEvent_ChallengeMachine: ; 38db (0:38db)
GameEvent_ContinueDuel: ; 38fb (0:38fb)
xor a
- ld [wd112], a
+ ld [wSongOverride], a
bank1call TryContinueDuel
call EnableSRAM
ld a, [sPlayerInChallengeMachine]
@@ -10942,14 +10942,14 @@ PlayDefaultSong: ; 39fc (0:39fc)
pop af
jr z, .asm_3a11
ld a, c
- ld hl, wd112
+ ld hl, wSongOverride
cp [hl]
jr z, .asm_3a1c
.asm_3a11
ld a, c
cp NUM_SONGS
jr nc, .asm_3a1c
- ld [wd112], a
+ ld [wSongOverride], a
call PlaySong
.asm_3a1c
pop bc
diff --git a/src/engine/sequences/opening_sequence_commands.asm b/src/engine/sequences/opening_sequence_commands.asm
index 6697b11..446daa2 100644
--- a/src/engine/sequences/opening_sequence_commands.asm
+++ b/src/engine/sequences/opening_sequence_commands.asm
@@ -136,13 +136,13 @@ OpeningSequenceCmd_SetOrbsCoordinates: ; 1d486 (7:5486)
ret
OpeningOrbAnimations_CharizardScene: ; 1d4b0 (7:54b0)
- db $c0 ; GRASS
- db $c1 ; FIRE
- db $c1 ; WATER
- db $c0 ; COLORLESS
- db $c1 ; LIGHTNING
- db $c0 ; PSYCHIC
- db $c1 ; FIGHTING
+ db SPRITE_ANIM_192 ; GRASS
+ db SPRITE_ANIM_193 ; FIRE
+ db SPRITE_ANIM_193 ; WATER
+ db SPRITE_ANIM_192 ; COLORLESS
+ db SPRITE_ANIM_193 ; LIGHTNING
+ db SPRITE_ANIM_192 ; PSYCHIC
+ db SPRITE_ANIM_193 ; FIGHTING
OpeningOrbCoordinates_CharizardScene: ; 1d4b7 (7:54b7)
; x coord, y coord
@@ -155,13 +155,13 @@ OpeningOrbCoordinates_CharizardScene: ; 1d4b7 (7:54b7)
db 160, 44 ; FIGHTING
OpeningOrbAnimations_ScytherScene: ; 1d4c5 (7:54c5)
- db $c1 ; GRASS
- db $c0 ; FIRE
- db $c0 ; WATER
- db $c1 ; COLORLESS
- db $c0 ; LIGHTNING
- db $c1 ; PSYCHIC
- db $c0 ; FIGHTING
+ db SPRITE_ANIM_193 ; GRASS
+ db SPRITE_ANIM_192 ; FIRE
+ db SPRITE_ANIM_192 ; WATER
+ db SPRITE_ANIM_193 ; COLORLESS
+ db SPRITE_ANIM_192 ; LIGHTNING
+ db SPRITE_ANIM_193 ; PSYCHIC
+ db SPRITE_ANIM_192 ; FIGHTING
OpeningOrbCoordinates_ScytherScene: ; 1d4cc (7:54cc)
; x coord, y coord
@@ -174,13 +174,13 @@ OpeningOrbCoordinates_ScytherScene: ; 1d4cc (7:54cc)
db 240, 44 ; FIGHTING
OpeningOrbAnimations_AerodactylScene: ; 1d4da (7:54da)
- db $c2 ; GRASS
- db $c5 ; FIRE
- db $c8 ; WATER
- db $cb ; COLORLESS
- db $ce ; LIGHTNING
- db $d1 ; PSYCHIC
- db $d4 ; FIGHTING
+ db SPRITE_ANIM_194 ; GRASS
+ db SPRITE_ANIM_197 ; FIRE
+ db SPRITE_ANIM_200 ; WATER
+ db SPRITE_ANIM_203 ; COLORLESS
+ db SPRITE_ANIM_206 ; LIGHTNING
+ db SPRITE_ANIM_209 ; PSYCHIC
+ db SPRITE_ANIM_212 ; FIGHTING
OpeningOrbCoordinates_AerodactylScene: ; 1d4e1 (7:54e1)
; x coord, y coord
@@ -193,13 +193,13 @@ OpeningOrbCoordinates_AerodactylScene: ; 1d4e1 (7:54e1)
db 160, 48 ; FIGHTING
OpeningOrbAnimations_InitialTitleScreen: ; 1d4ef (7:54ef)
- db $c3 ; GRASS
- db $c6 ; FIRE
- db $c9 ; WATER
- db $cc ; COLORLESS
- db $cf ; LIGHTNING
- db $d2 ; PSYCHIC
- db $d5 ; FIGHTING
+ db SPRITE_ANIM_195 ; GRASS
+ db SPRITE_ANIM_198 ; FIRE
+ db SPRITE_ANIM_201 ; WATER
+ db SPRITE_ANIM_204 ; COLORLESS
+ db SPRITE_ANIM_207 ; LIGHTNING
+ db SPRITE_ANIM_210 ; PSYCHIC
+ db SPRITE_ANIM_213 ; FIGHTING
OpeningOrbCoordinates_InitialTitleScreen: ; 1d4f6 (7:54f6)
; x coord, y coord
@@ -212,13 +212,13 @@ OpeningOrbCoordinates_InitialTitleScreen: ; 1d4f6 (7:54f6)
db 72, 144 ; FIGHTING
OpeningOrbAnimations_InTitleScreen: ; 1d504 (7:5504)
- db $c4 ; GRASS
- db $c7 ; FIRE
- db $ca ; WATER
- db $cd ; COLORLESS
- db $d0 ; LIGHTNING
- db $d3 ; PSYCHIC
- db $d6 ; FIGHTING
+ db SPRITE_ANIM_196 ; GRASS
+ db SPRITE_ANIM_199 ; FIRE
+ db SPRITE_ANIM_202 ; WATER
+ db SPRITE_ANIM_205 ; COLORLESS
+ db SPRITE_ANIM_208 ; LIGHTNING
+ db SPRITE_ANIM_211 ; PSYCHIC
+ db SPRITE_ANIM_214 ; FIGHTING
OpeningOrbCoordinates_InTitleScreen: ; 1d50b (7:550b)
; x coord, y coord
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 18:28:33 +0000