Disassemble Intro and TitleScreen

Makefile

@@ -108,7 +108,7 @@ src/gfx/scenes/tileset1C3.2bpp: rgbgfx += -x 1
 src/gfx/scenes/tileset1C6.2bpp: rgbgfx += -x 2
 src/gfx/scenes/tileset1C7.2bpp: rgbgfx += -x 2
 src/gfx/scenes/tileset1CC.2bpp: rgbgfx += -x 1
-src/gfx/scenes/tileset1CD.2bpp: rgbgfx += -x 4
+src/gfx/scenes/title_screen.2bpp: rgbgfx += -x 4
 src/gfx/scenes/tileset1CF.2bpp: rgbgfx += -x 10
 src/gfx/scenes/tileset1D1.2bpp: rgbgfx += -x 5
 src/gfx/scenes/tileset1DB.2bpp: rgbgfx += -x 9

src/constants.asm

@@ -4,6 +4,7 @@ INCLUDE "constants/deck_ai_constants.asm"
 INCLUDE "constants/duel_constants.asm"
 INCLUDE "constants/gfx_constants.asm"
 INCLUDE "constants/hardware_constants.asm"
+INCLUDE "constants/intro_constants.asm"
 INCLUDE "constants/misc_constants.asm"
 INCLUDE "constants/name_constants.asm"
 INCLUDE "constants/sgb_constants.asm"
@@ -11,6 +12,8 @@ INCLUDE "constants/text_constants.asm"
 INCLUDE "constants/attack_animation_constants.asm"
 INCLUDE "constants/charmaps.asm"
 INCLUDE "constants/menu_constants.asm"
+INCLUDE "constants/music_constants.asm"
+INCLUDE "constants/sprite_anim_constants.asm"
 INCLUDE "constants/scene_constants.asm"
 INCLUDE "constants/palette_constants.asm"
 INCLUDE "constants/tileset_constants.asm"

src/constants/intro_constants.asm

@@ -0,0 +1,15 @@
+DEF NUM_INTRO_ORBS EQU 8
+
+; values for wIntroOrbsStates
+	const_def
+	const INTRO_ORB_STATE_START
+	const INTRO_ORB_STATE_STOP
+	const INTRO_ORB_STATE_FINISH
+
+; Base Set
+; Jungle
+; Fossil
+; Team Rocket
+DEF NUM_INTRO_SCENES EQU 4
+
+DEF NUM_TITLE_SCREEN_CARDS EQU 8

src/constants/music_constants.asm

@@ -0,0 +1,61 @@
+	const_def
+	const MUSIC_STOP           ; $00
+	const MUSIC_TITLESCREEN    ; $01
+	const MUSIC_DUELTHEME_1    ; $02
+	const MUSIC_DUELTHEME_2    ; $03
+	const MUSIC_DUELTHEME_3    ; $04
+	const MUSIC_PAUSEMENU      ; $05
+	const MUSIC_PCMAINMENU     ; $06
+	const MUSIC_DECKMACHINE    ; $07
+	const MUSIC_CARDPOP        ; $08
+	const MUSIC_OVERWORLD      ; $09
+	const MUSIC_POKEMONDOME    ; $0a
+	const MUSIC_CHALLENGEHALL  ; $0b
+	const MUSIC_CLUB_1         ; $0c
+	const MUSIC_CLUB_2         ; $0d
+	const MUSIC_CLUB_3         ; $0e
+	const MUSIC_RONALD         ; $0f
+	const MUSIC_IMAKUNI        ; $10
+	const MUSIC_HALLOFHONOR    ; $11
+	const MUSIC_12             ; $12
+	const MUSIC_13             ; $13
+	const MUSIC_HERECOMESGR    ; $14
+	const MUSIC_GROVERWORLD    ; $15
+	const MUSIC_FORT_1         ; $16
+	const MUSIC_FORT_2         ; $17
+	const MUSIC_FORT_3         ; $18
+	const MUSIC_FORT_4         ; $19
+	const MUSIC_GRCASTLE       ; $1a
+	const MUSIC_1B             ; $1b
+	const MUSIC_GRCHALLENGECUP ; $1c
+	const MUSIC_GAMECORNER     ; $1d
+	const MUSIC_GRBLIMP        ; $1e
+	const MUSIC_GRDUELTHEME_1  ; $1f
+	const MUSIC_GRDUELTHEME_2  ; $20
+	const MUSIC_GRDUELTHEME_3  ; $21
+	const MUSIC_22             ; $22
+	const MUSIC_ISHIHARA       ; $23
+	const MUSIC_IMAKUNI2       ; $24
+	const MUSIC_CREDITS        ; $25
+	const MUSIC_26             ; $26
+	const MUSIC_27             ; $27
+	const MUSIC_MATCHSTART_1   ; $28
+	const MUSIC_MATCHSTART_2   ; $29
+	const MUSIC_MATCHSTART_3   ; $2a
+	const MUSIC_MATCHVICTORY   ; $2b
+	const MUSIC_MATCHLOSS      ; $2c
+	const MUSIC_MATCHDRAW      ; $2d
+	const MUSIC_UNUSED_2E      ; $2e
+	const MUSIC_BOOSTERPACK    ; $2f
+	const MUSIC_MEDAL          ; $30
+	const MUSIC_UNUSED_31      ; $31
+	const MUSIC_DITTY_1        ; $32
+	const MUSIC_DITTY_2        ; $33
+	const MUSIC_DITTY_3        ; $34
+	const MUSIC_DITTY_4        ; $35
+	const MUSIC_DITTY_5        ; $36
+	const MUSIC_37             ; $37
+	const MUSIC_38             ; $38
+	const MUSIC_39             ; $39
+	const MUSIC_DITTY6         ; $3a
+	const MUSIC_3B             ; $3b

src/constants/scene_constants.asm

@@ -9,10 +9,10 @@
 	const SCENE_07 ; $07
 	const SCENE_08 ; $08
 	const SCENE_09 ; $09
-	const SCENE_0A ; $0a
-	const SCENE_0B ; $0b
-	const SCENE_0C ; $0c
-	const SCENE_0D ; $0d
+	const SCENE_INTRO_BASE_SET ; $0a
+	const SCENE_INTRO_JUNGLE ; $0b
+	const SCENE_INTRO_FOSSIL ; $0c
+	const SCENE_INTRO_TEAM_ROCKET ; $0d
 	const SCENE_0E ; $0e
 	const SCENE_0F ; $0f
 	const SCENE_10 ; $10
@@ -36,18 +36,3 @@
 	const SCENE_22 ; $22
 	const SCENE_23 ; $23
 	const SCENE_GBC_ONLY_DISCLAIMER ; $24
-
-RSRESET
-SCENE_UNK_STRUCT_0 RB ; $0
-SCENE_UNK_STRUCT_1 RB ; $1
-SCENE_UNK_STRUCT_2 RB ; $2
-SCENE_UNK_STRUCT_3 RW ; $3
-SCENE_UNK_STRUCT_5 RB ; $5
-SCENE_UNK_STRUCT_6 RW ; $6
-SCENE_UNK_STRUCT_8 RB ; $8
-SCENE_UNK_STRUCT_9 RB ; $9
-SCENE_UNK_STRUCT_A RW ; $a
-SCENE_UNK_STRUCT_C RB ; $c
-SCENE_UNK_STRUCT_D RB ; $d
-SCENE_UNK_STRUCT_E RW ; $e
-DEF SCENE_UNK_STRUCT_LENGTH EQU _RS

src/constants/sprite_anim_constants.asm

@@ -0,0 +1,597 @@
+DEF NUM_SPRITE_ANIM_STRUCTS EQU 10
+
+RSRESET
+SPRITEANIMSTRUCT_FLAGS RB ; $0
+SPRITEANIMSTRUCT_1     RB ; $1
+SPRITEANIMSTRUCT_2     RB ; $2
+SPRITEANIMSTRUCT_X_POS RB ; $3
+SPRITEANIMSTRUCT_Y_POS RB ; $4
+SPRITEANIMSTRUCT_FRAME_INDEX     RB ; $5
+SPRITEANIMSTRUCT_FRAMESET_ID     RW ; $6
+SPRITEANIMSTRUCT_FRAME_DURATION     RB ; $8
+SPRITEANIMSTRUCT_TILE_OFFSET     RB ; $9
+SPRITEANIMSTRUCT_ANIM_ID     RW ; $a
+SPRITEANIMSTRUCT_C     RB ; $c
+SPRITEANIMSTRUCT_START_DELAY     RB ; $d
+SPRITEANIMSTRUCT_E     RW ; $e
+DEF SPRITEANIMSTRUCT_LENGTH EQU _RS
+
+; flags for SPRITEANIMSTRUCT_FLAGS
+	const_def
+	const SPRITEANIMSTRUCT_SPEED_F ; $0
+const_value = 4
+	const SPRITEANIMSTRUCT_ANIMATING_F ; $4
+	const SPRITEANIMSTRUCT_MOVE_F ; $5
+	const SPRITEANIMSTRUCT_FLAG6_F ; $6
+	const SPRITEANIMSTRUCT_ACTIVE_F ; $7
+
+DEF SPRITEANIMSTRUCT_SPEED EQU (1 << SPRITEANIMSTRUCT_SPEED_F) ; $01
+DEF SPRITEANIMSTRUCT_ANIMATING EQU (1 << SPRITEANIMSTRUCT_ANIMATING_F) ; $10
+DEF SPRITEANIMSTRUCT_MOVE  EQU (1 << SPRITEANIMSTRUCT_MOVE_F)  ; $20
+DEF SPRITEANIMSTRUCT_FLAG6 EQU (1 << SPRITEANIMSTRUCT_FLAG6_F) ; $40
+DEF SPRITEANIMSTRUCT_ACTIVE EQU (1 << SPRITEANIMSTRUCT_ACTIVE_F) ; $80
+
+; direction value of animation
+; 000 = up
+; 001 = right
+; 010 = down
+; 011 = left
+; 100 = up-right
+; 101 = down-right
+; 110 = down-left
+; 111 = up-left
+DEF SPRITEANIMSTRUCT_DIR_MASK EQU %00001110
+
+	const_def
+	const SPRITE_ANIM_00 ; $00
+	const SPRITE_ANIM_01 ; $01
+	const SPRITE_ANIM_02 ; $02
+	const SPRITE_ANIM_03 ; $03
+	const SPRITE_ANIM_04 ; $04
+	const SPRITE_ANIM_05 ; $05
+	const SPRITE_ANIM_06 ; $06
+	const SPRITE_ANIM_07 ; $07
+	const SPRITE_ANIM_08 ; $08
+	const SPRITE_ANIM_09 ; $09
+	const SPRITE_ANIM_0A ; $0a
+	const SPRITE_ANIM_0B ; $0b
+	const SPRITE_ANIM_0C ; $0c
+	const SPRITE_ANIM_0D ; $0d
+	const SPRITE_ANIM_0E ; $0e
+	const SPRITE_ANIM_0F ; $0f
+	const SPRITE_ANIM_10 ; $10
+	const SPRITE_ANIM_11 ; $11
+	const SPRITE_ANIM_12 ; $12
+	const SPRITE_ANIM_13 ; $13
+	const SPRITE_ANIM_14 ; $14
+	const SPRITE_ANIM_15 ; $15
+	const SPRITE_ANIM_16 ; $16
+	const SPRITE_ANIM_17 ; $17
+	const SPRITE_ANIM_18 ; $18
+	const SPRITE_ANIM_19 ; $19
+	const SPRITE_ANIM_1A ; $1a
+	const SPRITE_ANIM_1B ; $1b
+	const SPRITE_ANIM_1C ; $1c
+	const SPRITE_ANIM_1D ; $1d
+	const SPRITE_ANIM_1E ; $1e
+	const SPRITE_ANIM_1F ; $1f
+	const SPRITE_ANIM_20 ; $20
+	const SPRITE_ANIM_21 ; $21
+	const SPRITE_ANIM_22 ; $22
+	const SPRITE_ANIM_23 ; $23
+	const SPRITE_ANIM_24 ; $24
+	const SPRITE_ANIM_25 ; $25
+	const SPRITE_ANIM_26 ; $26
+	const SPRITE_ANIM_27 ; $27
+	const SPRITE_ANIM_28 ; $28
+	const SPRITE_ANIM_29 ; $29
+	const SPRITE_ANIM_2A ; $2a
+	const SPRITE_ANIM_2B ; $2b
+	const SPRITE_ANIM_2C ; $2c
+	const SPRITE_ANIM_2D ; $2d
+	const SPRITE_ANIM_2E ; $2e
+	const SPRITE_ANIM_2F ; $2f
+	const SPRITE_ANIM_30 ; $30
+	const SPRITE_ANIM_31 ; $31
+	const SPRITE_ANIM_32 ; $32
+	const SPRITE_ANIM_33 ; $33
+	const SPRITE_ANIM_34 ; $34
+	const SPRITE_ANIM_35 ; $35
+	const SPRITE_ANIM_36 ; $36
+	const SPRITE_ANIM_37 ; $37
+	const SPRITE_ANIM_38 ; $38
+	const SPRITE_ANIM_39 ; $39
+	const SPRITE_ANIM_3A ; $3a
+	const SPRITE_ANIM_3B ; $3b
+	const SPRITE_ANIM_3C ; $3c
+	const SPRITE_ANIM_3D ; $3d
+	const SPRITE_ANIM_3E ; $3e
+	const SPRITE_ANIM_3F ; $3f
+	const SPRITE_ANIM_40 ; $40
+	const SPRITE_ANIM_41 ; $41
+	const SPRITE_ANIM_42 ; $42
+	const SPRITE_ANIM_43 ; $43
+	const SPRITE_ANIM_44 ; $44
+	const SPRITE_ANIM_45 ; $45
+	const SPRITE_ANIM_46 ; $46
+	const SPRITE_ANIM_47 ; $47
+	const SPRITE_ANIM_48 ; $48
+	const SPRITE_ANIM_49 ; $49
+	const SPRITE_ANIM_4A ; $4a
+	const SPRITE_ANIM_4B ; $4b
+	const SPRITE_ANIM_4C ; $4c
+	const SPRITE_ANIM_4D ; $4d
+	const SPRITE_ANIM_4E ; $4e
+	const SPRITE_ANIM_4F ; $4f
+	const SPRITE_ANIM_50 ; $50
+	const SPRITE_ANIM_51 ; $51
+	const SPRITE_ANIM_52 ; $52
+	const SPRITE_ANIM_53 ; $53
+	const SPRITE_ANIM_54 ; $54
+	const SPRITE_ANIM_55 ; $55
+	const SPRITE_ANIM_56 ; $56
+	const SPRITE_ANIM_57 ; $57
+	const SPRITE_ANIM_58 ; $58
+	const SPRITE_ANIM_59 ; $59
+	const SPRITE_ANIM_5A ; $5a
+	const SPRITE_ANIM_5B ; $5b
+	const SPRITE_ANIM_5C ; $5c
+	const SPRITE_ANIM_5D ; $5d
+	const SPRITE_ANIM_5E ; $5e
+	const SPRITE_ANIM_5F ; $5f
+	const SPRITE_ANIM_60 ; $60
+	const SPRITE_ANIM_61 ; $61
+	const SPRITE_ANIM_62 ; $62
+	const SPRITE_ANIM_63 ; $63
+	const SPRITE_ANIM_64 ; $64
+	const SPRITE_ANIM_65 ; $65
+	const SPRITE_ANIM_66 ; $66
+	const SPRITE_ANIM_67 ; $67
+	const SPRITE_ANIM_68 ; $68
+	const SPRITE_ANIM_69 ; $69
+	const SPRITE_ANIM_6A ; $6a
+	const SPRITE_ANIM_6B ; $6b
+	const SPRITE_ANIM_6C ; $6c
+	const SPRITE_ANIM_6D ; $6d
+	const SPRITE_ANIM_6E ; $6e
+	const SPRITE_ANIM_6F ; $6f
+	const SPRITE_ANIM_70 ; $70
+	const SPRITE_ANIM_71 ; $71
+	const SPRITE_ANIM_72 ; $72
+	const SPRITE_ANIM_73 ; $73
+	const SPRITE_ANIM_74 ; $74
+	const SPRITE_ANIM_75 ; $75
+	const SPRITE_ANIM_76 ; $76
+	const SPRITE_ANIM_77 ; $77
+	const SPRITE_ANIM_78 ; $78
+	const SPRITE_ANIM_79 ; $79
+	const SPRITE_ANIM_7A ; $7a
+	const SPRITE_ANIM_7B ; $7b
+	const SPRITE_ANIM_7C ; $7c
+	const SPRITE_ANIM_7D ; $7d
+	const SPRITE_ANIM_7E ; $7e
+	const SPRITE_ANIM_7F ; $7f
+	const SPRITE_ANIM_80 ; $80
+	const SPRITE_ANIM_81 ; $81
+	const SPRITE_ANIM_82 ; $82
+	const SPRITE_ANIM_83 ; $83
+	const SPRITE_ANIM_84 ; $84
+	const SPRITE_ANIM_85 ; $85
+	const SPRITE_ANIM_86 ; $86
+	const SPRITE_ANIM_87 ; $87
+	const SPRITE_ANIM_88 ; $88
+	const SPRITE_ANIM_89 ; $89
+	const SPRITE_ANIM_8A ; $8a
+	const SPRITE_ANIM_8B ; $8b
+	const SPRITE_ANIM_8C ; $8c
+	const SPRITE_ANIM_8D ; $8d
+	const SPRITE_ANIM_8E ; $8e
+	const SPRITE_ANIM_8F ; $8f
+	const SPRITE_ANIM_90 ; $90
+	const SPRITE_ANIM_91 ; $91
+	const SPRITE_ANIM_92 ; $92
+	const SPRITE_ANIM_93 ; $93
+	const SPRITE_ANIM_94 ; $94
+	const SPRITE_ANIM_95 ; $95
+	const SPRITE_ANIM_96 ; $96
+	const SPRITE_ANIM_97 ; $97
+	const SPRITE_ANIM_98 ; $98
+	const SPRITE_ANIM_99 ; $99
+	const SPRITE_ANIM_9A ; $9a
+	const SPRITE_ANIM_9B ; $9b
+	const SPRITE_ANIM_9C ; $9c
+	const SPRITE_ANIM_9D ; $9d
+	const SPRITE_ANIM_9E ; $9e
+	const SPRITE_ANIM_9F ; $9f
+	const SPRITE_ANIM_A0 ; $a0
+	const SPRITE_ANIM_A1 ; $a1
+	const SPRITE_ANIM_A2 ; $a2
+	const SPRITE_ANIM_A3 ; $a3
+	const SPRITE_ANIM_A4 ; $a4
+	const SPRITE_ANIM_A5 ; $a5
+	const SPRITE_ANIM_A6 ; $a6
+	const SPRITE_ANIM_A7 ; $a7
+	const SPRITE_ANIM_A8 ; $a8
+	const SPRITE_ANIM_A9 ; $a9
+	const SPRITE_ANIM_AA ; $aa
+	const SPRITE_ANIM_AB ; $ab
+	const SPRITE_ANIM_AC ; $ac
+	const SPRITE_ANIM_AD ; $ad
+
+	const_def
+	const FRAMESET_000 ; $000
+	const FRAMESET_001 ; $001
+	const FRAMESET_002 ; $002
+	const FRAMESET_003 ; $003
+	const FRAMESET_004 ; $004
+	const FRAMESET_005 ; $005
+	const FRAMESET_006 ; $006
+	const FRAMESET_007 ; $007
+	const FRAMESET_008 ; $008
+	const FRAMESET_009 ; $009
+	const FRAMESET_00A ; $00a
+	const FRAMESET_00B ; $00b
+	const FRAMESET_00C ; $00c
+	const FRAMESET_00D ; $00d
+	const FRAMESET_00E ; $00e
+	const FRAMESET_00F ; $00f
+	const FRAMESET_010 ; $010
+	const FRAMESET_011 ; $011
+	const FRAMESET_012 ; $012
+	const FRAMESET_013 ; $013
+	const FRAMESET_014 ; $014
+	const FRAMESET_015 ; $015
+	const FRAMESET_016 ; $016
+	const FRAMESET_017 ; $017
+	const FRAMESET_018 ; $018
+	const FRAMESET_019 ; $019
+	const FRAMESET_01A ; $01a
+	const FRAMESET_01B ; $01b
+	const FRAMESET_01C ; $01c
+	const FRAMESET_01D ; $01d
+	const FRAMESET_01E ; $01e
+	const FRAMESET_01F ; $01f
+	const FRAMESET_020 ; $020
+	const FRAMESET_021 ; $021
+	const FRAMESET_022 ; $022
+	const FRAMESET_023 ; $023
+	const FRAMESET_024 ; $024
+	const FRAMESET_025 ; $025
+	const FRAMESET_026 ; $026
+	const FRAMESET_027 ; $027
+	const FRAMESET_028 ; $028
+	const FRAMESET_029 ; $029
+	const FRAMESET_02A ; $02a
+	const FRAMESET_02B ; $02b
+	const FRAMESET_02C ; $02c
+	const FRAMESET_02D ; $02d
+	const FRAMESET_02E ; $02e
+	const FRAMESET_02F ; $02f
+	const FRAMESET_030 ; $030
+	const FRAMESET_031 ; $031
+	const FRAMESET_032 ; $032
+	const FRAMESET_033 ; $033
+	const FRAMESET_034 ; $034
+	const FRAMESET_035 ; $035
+	const FRAMESET_036 ; $036
+	const FRAMESET_037 ; $037
+	const FRAMESET_038 ; $038
+	const FRAMESET_039 ; $039
+	const FRAMESET_03A ; $03a
+	const FRAMESET_03B ; $03b
+	const FRAMESET_03C ; $03c
+	const FRAMESET_03D ; $03d
+	const FRAMESET_03E ; $03e
+	const FRAMESET_03F ; $03f
+	const FRAMESET_040 ; $040
+	const FRAMESET_041 ; $041
+	const FRAMESET_042 ; $042
+	const FRAMESET_043 ; $043
+	const FRAMESET_044 ; $044
+	const FRAMESET_045 ; $045
+	const FRAMESET_046 ; $046
+	const FRAMESET_047 ; $047
+	const FRAMESET_048 ; $048
+	const FRAMESET_049 ; $049
+	const FRAMESET_04A ; $04a
+	const FRAMESET_04B ; $04b
+	const FRAMESET_04C ; $04c
+	const FRAMESET_04D ; $04d
+	const FRAMESET_04E ; $04e
+	const FRAMESET_04F ; $04f
+	const FRAMESET_050 ; $050
+	const FRAMESET_051 ; $051
+	const FRAMESET_052 ; $052
+	const FRAMESET_053 ; $053
+	const FRAMESET_054 ; $054
+	const FRAMESET_055 ; $055
+	const FRAMESET_056 ; $056
+	const FRAMESET_057 ; $057
+	const FRAMESET_058 ; $058
+	const FRAMESET_059 ; $059
+	const FRAMESET_05A ; $05a
+	const FRAMESET_05B ; $05b
+	const FRAMESET_05C ; $05c
+	const FRAMESET_05D ; $05d
+	const FRAMESET_05E ; $05e
+	const FRAMESET_05F ; $05f
+	const FRAMESET_060 ; $060
+	const FRAMESET_061 ; $061
+	const FRAMESET_062 ; $062
+	const FRAMESET_063 ; $063
+	const FRAMESET_064 ; $064
+	const FRAMESET_065 ; $065
+	const FRAMESET_066 ; $066
+	const FRAMESET_067 ; $067
+	const FRAMESET_068 ; $068
+	const FRAMESET_069 ; $069
+	const FRAMESET_06A ; $06a
+	const FRAMESET_06B ; $06b
+	const FRAMESET_06C ; $06c
+	const FRAMESET_06D ; $06d
+	const FRAMESET_06E ; $06e
+	const FRAMESET_06F ; $06f
+	const FRAMESET_070 ; $070
+	const FRAMESET_071 ; $071
+	const FRAMESET_072 ; $072
+	const FRAMESET_073 ; $073
+	const FRAMESET_074 ; $074
+	const FRAMESET_075 ; $075
+	const FRAMESET_076 ; $076
+	const FRAMESET_077 ; $077
+	const FRAMESET_078 ; $078
+	const FRAMESET_079 ; $079
+	const FRAMESET_07A ; $07a
+	const FRAMESET_07B ; $07b
+	const FRAMESET_07C ; $07c
+	const FRAMESET_07D ; $07d
+	const FRAMESET_07E ; $07e
+	const FRAMESET_07F ; $07f
+	const FRAMESET_080 ; $080
+	const FRAMESET_081 ; $081
+	const FRAMESET_082 ; $082
+	const FRAMESET_083 ; $083
+	const FRAMESET_084 ; $084
+	const FRAMESET_085 ; $085
+	const FRAMESET_086 ; $086
+	const FRAMESET_087 ; $087
+	const FRAMESET_088 ; $088
+	const FRAMESET_089 ; $089
+	const FRAMESET_08A ; $08a
+	const FRAMESET_08B ; $08b
+	const FRAMESET_08C ; $08c
+	const FRAMESET_08D ; $08d
+	const FRAMESET_08E ; $08e
+	const FRAMESET_08F ; $08f
+	const FRAMESET_090 ; $090
+	const FRAMESET_091 ; $091
+	const FRAMESET_092 ; $092
+	const FRAMESET_093 ; $093
+	const FRAMESET_094 ; $094
+	const FRAMESET_095 ; $095
+	const FRAMESET_096 ; $096
+	const FRAMESET_097 ; $097
+	const FRAMESET_098 ; $098
+	const FRAMESET_099 ; $099
+	const FRAMESET_09A ; $09a
+	const FRAMESET_09B ; $09b
+	const FRAMESET_09C ; $09c
+	const FRAMESET_09D ; $09d
+	const FRAMESET_09E ; $09e
+	const FRAMESET_09F ; $09f
+	const FRAMESET_0A0 ; $0a0
+	const FRAMESET_0A1 ; $0a1
+	const FRAMESET_0A2 ; $0a2
+	const FRAMESET_0A3 ; $0a3
+	const FRAMESET_0A4 ; $0a4
+	const FRAMESET_0A5 ; $0a5
+	const FRAMESET_0A6 ; $0a6
+	const FRAMESET_0A7 ; $0a7
+	const FRAMESET_0A8 ; $0a8
+	const FRAMESET_0A9 ; $0a9
+	const FRAMESET_0AA ; $0aa
+	const FRAMESET_0AB ; $0ab
+	const FRAMESET_0AC ; $0ac
+	const FRAMESET_0AD ; $0ad
+	const FRAMESET_0AE ; $0ae
+	const FRAMESET_0AF ; $0af
+	const FRAMESET_0B0 ; $0b0
+	const FRAMESET_0B1 ; $0b1
+	const FRAMESET_0B2 ; $0b2
+	const FRAMESET_0B3 ; $0b3
+	const FRAMESET_0B4 ; $0b4
+	const FRAMESET_0B5 ; $0b5
+	const FRAMESET_0B6 ; $0b6
+	const FRAMESET_0B7 ; $0b7
+	const FRAMESET_0B8 ; $0b8
+	const FRAMESET_0B9 ; $0b9
+	const FRAMESET_0BA ; $0ba
+	const FRAMESET_0BB ; $0bb
+	const FRAMESET_0BC ; $0bc
+	const FRAMESET_0BD ; $0bd
+	const FRAMESET_0BE ; $0be
+	const FRAMESET_0BF ; $0bf
+	const FRAMESET_0C0 ; $0c0
+	const FRAMESET_0C1 ; $0c1
+	const FRAMESET_0C2 ; $0c2
+	const FRAMESET_0C3 ; $0c3
+	const FRAMESET_0C4 ; $0c4
+	const FRAMESET_0C5 ; $0c5
+	const FRAMESET_0C6 ; $0c6
+	const FRAMESET_0C7 ; $0c7
+	const FRAMESET_0C8 ; $0c8
+	const FRAMESET_0C9 ; $0c9
+	const FRAMESET_0CA ; $0ca
+	const FRAMESET_0CB ; $0cb
+	const FRAMESET_0CC ; $0cc
+	const FRAMESET_0CD ; $0cd
+	const FRAMESET_0CE ; $0ce
+	const FRAMESET_0CF ; $0cf
+	const FRAMESET_0D0 ; $0d0
+	const FRAMESET_0D1 ; $0d1
+	const FRAMESET_0D2 ; $0d2
+	const FRAMESET_0D3 ; $0d3
+	const FRAMESET_0D4 ; $0d4
+	const FRAMESET_0D5 ; $0d5
+	const FRAMESET_0D6 ; $0d6
+	const FRAMESET_0D7 ; $0d7
+	const FRAMESET_0D8 ; $0d8
+	const FRAMESET_0D9 ; $0d9
+	const FRAMESET_0DA ; $0da
+	const FRAMESET_0DB ; $0db
+	const FRAMESET_0DC ; $0dc
+	const FRAMESET_0DD ; $0dd
+	const FRAMESET_0DE ; $0de
+	const FRAMESET_0DF ; $0df
+	const FRAMESET_0E0 ; $0e0
+	const FRAMESET_0E1 ; $0e1
+	const FRAMESET_0E2 ; $0e2
+	const FRAMESET_0E3 ; $0e3
+	const FRAMESET_0E4 ; $0e4
+	const FRAMESET_0E5 ; $0e5
+	const FRAMESET_0E6 ; $0e6
+	const FRAMESET_0E7 ; $0e7
+	const FRAMESET_0E8 ; $0e8
+	const FRAMESET_0E9 ; $0e9
+	const FRAMESET_0EA ; $0ea
+	const FRAMESET_0EB ; $0eb
+	const FRAMESET_0EC ; $0ec
+	const FRAMESET_0ED ; $0ed
+	const FRAMESET_0EE ; $0ee
+	const FRAMESET_0EF ; $0ef
+	const FRAMESET_0F0 ; $0f0
+	const FRAMESET_0F1 ; $0f1
+	const FRAMESET_0F2 ; $0f2
+	const FRAMESET_0F3 ; $0f3
+	const FRAMESET_0F4 ; $0f4
+	const FRAMESET_0F5 ; $0f5
+	const FRAMESET_0F6 ; $0f6
+	const FRAMESET_0F7 ; $0f7
+	const FRAMESET_0F8 ; $0f8
+	const FRAMESET_0F9 ; $0f9
+	const FRAMESET_0FA ; $0fa
+	const FRAMESET_0FB ; $0fb
+	const FRAMESET_0FC ; $0fc
+	const FRAMESET_0FD ; $0fd
+	const FRAMESET_0FE ; $0fe
+	const FRAMESET_0FF ; $0ff
+	const FRAMESET_100 ; $100
+	const FRAMESET_101 ; $101
+	const FRAMESET_102 ; $102
+	const FRAMESET_103 ; $103
+	const FRAMESET_104 ; $104
+	const FRAMESET_105 ; $105
+	const FRAMESET_106 ; $106
+	const FRAMESET_107 ; $107
+	const FRAMESET_108 ; $108
+	const FRAMESET_109 ; $109
+	const FRAMESET_10A ; $10a
+	const FRAMESET_10B ; $10b
+	const FRAMESET_10C ; $10c
+	const FRAMESET_10D ; $10d
+	const FRAMESET_10E ; $10e
+	const FRAMESET_10F ; $10f
+	const FRAMESET_110 ; $110
+	const FRAMESET_111 ; $111
+	const FRAMESET_112 ; $112
+	const FRAMESET_113 ; $113
+	const FRAMESET_114 ; $114
+	const FRAMESET_115 ; $115
+	const FRAMESET_116 ; $116
+	const FRAMESET_117 ; $117
+	const FRAMESET_118 ; $118
+	const FRAMESET_119 ; $119
+	const FRAMESET_11A ; $11a
+	const FRAMESET_11B ; $11b
+	const FRAMESET_11C ; $11c
+	const FRAMESET_11D ; $11d
+	const FRAMESET_11E ; $11e
+	const FRAMESET_11F ; $11f
+	const FRAMESET_120 ; $120
+	const FRAMESET_121 ; $121
+	const FRAMESET_122 ; $122
+	const FRAMESET_123 ; $123
+	const FRAMESET_124 ; $124
+	const FRAMESET_125 ; $125
+	const FRAMESET_126 ; $126
+	const FRAMESET_127 ; $127
+	const FRAMESET_128 ; $128
+	const FRAMESET_129 ; $129
+	const FRAMESET_12A ; $12a
+	const FRAMESET_12B ; $12b
+	const FRAMESET_12C ; $12c
+	const FRAMESET_12D ; $12d
+	const FRAMESET_12E ; $12e
+	const FRAMESET_12F ; $12f
+	const FRAMESET_130 ; $130
+	const FRAMESET_131 ; $131
+	const FRAMESET_132 ; $132
+	const FRAMESET_133 ; $133
+	const FRAMESET_134 ; $134
+	const FRAMESET_135 ; $135
+	const FRAMESET_136 ; $136
+	const FRAMESET_137 ; $137
+	const FRAMESET_138 ; $138
+	const FRAMESET_139 ; $139
+	const FRAMESET_13A ; $13a
+	const FRAMESET_13B ; $13b
+	const FRAMESET_13C ; $13c
+	const FRAMESET_13D ; $13d
+	const FRAMESET_13E ; $13e
+	const FRAMESET_13F ; $13f
+	const FRAMESET_140 ; $140
+	const FRAMESET_141 ; $141
+	const FRAMESET_142 ; $142
+	const FRAMESET_143 ; $143
+	const FRAMESET_144 ; $144
+	const FRAMESET_145 ; $145
+	const FRAMESET_146 ; $146
+	const FRAMESET_147 ; $147
+	const FRAMESET_148 ; $148
+	const FRAMESET_149 ; $149
+	const FRAMESET_14A ; $14a
+	const FRAMESET_14B ; $14b
+	const FRAMESET_14C ; $14c
+	const FRAMESET_14D ; $14d
+	const FRAMESET_14E ; $14e
+	const FRAMESET_14F ; $14f
+	const FRAMESET_150 ; $150
+	const FRAMESET_151 ; $151
+	const FRAMESET_152 ; $152
+	const FRAMESET_153 ; $153
+	const FRAMESET_154 ; $154
+	const FRAMESET_155 ; $155
+	const FRAMESET_156 ; $156
+	const FRAMESET_157 ; $157
+	const FRAMESET_158 ; $158
+	const FRAMESET_159 ; $159
+	const FRAMESET_15A ; $15a
+	const FRAMESET_15B ; $15b
+	const FRAMESET_15C ; $15c
+	const FRAMESET_15D ; $15d
+	const FRAMESET_15E ; $15e
+	const FRAMESET_15F ; $15f
+	const FRAMESET_160 ; $160
+	const FRAMESET_161 ; $161
+	const FRAMESET_162 ; $162
+	const FRAMESET_163 ; $163
+	const FRAMESET_164 ; $164
+	const FRAMESET_165 ; $165
+	const FRAMESET_166 ; $166
+	const FRAMESET_167 ; $167
+	const FRAMESET_168 ; $168
+	const FRAMESET_169 ; $169
+	const FRAMESET_16A ; $16a
+	const FRAMESET_16B ; $16b
+	const FRAMESET_16C ; $16c
+	const FRAMESET_16D ; $16d
+	const FRAMESET_16E ; $16e
+	const FRAMESET_16F ; $16f
+	const FRAMESET_170 ; $170
+	const FRAMESET_171 ; $171
+	const FRAMESET_172 ; $172
+	const FRAMESET_173 ; $173
+	const FRAMESET_174 ; $174
+	const FRAMESET_175 ; $175
+	const FRAMESET_176 ; $176
+	const FRAMESET_177 ; $177

src/constants/sprite_constants.asm

@@ -1,175 +0,0 @@
-	const_def
-	const SPRITE_ANIM_00 ; $00
-	const SPRITE_ANIM_01 ; $01
-	const SPRITE_ANIM_02 ; $02
-	const SPRITE_ANIM_03 ; $03
-	const SPRITE_ANIM_04 ; $04
-	const SPRITE_ANIM_05 ; $05
-	const SPRITE_ANIM_06 ; $06
-	const SPRITE_ANIM_07 ; $07
-	const SPRITE_ANIM_08 ; $08
-	const SPRITE_ANIM_09 ; $09
-	const SPRITE_ANIM_0A ; $0a
-	const SPRITE_ANIM_0B ; $0b
-	const SPRITE_ANIM_0C ; $0c
-	const SPRITE_ANIM_0D ; $0d
-	const SPRITE_ANIM_0E ; $0e
-	const SPRITE_ANIM_0F ; $0f
-	const SPRITE_ANIM_10 ; $10
-	const SPRITE_ANIM_11 ; $11
-	const SPRITE_ANIM_12 ; $12
-	const SPRITE_ANIM_13 ; $13
-	const SPRITE_ANIM_14 ; $14
-	const SPRITE_ANIM_15 ; $15
-	const SPRITE_ANIM_16 ; $16
-	const SPRITE_ANIM_17 ; $17
-	const SPRITE_ANIM_18 ; $18
-	const SPRITE_ANIM_19 ; $19
-	const SPRITE_ANIM_1A ; $1a
-	const SPRITE_ANIM_1B ; $1b
-	const SPRITE_ANIM_1C ; $1c
-	const SPRITE_ANIM_1D ; $1d
-	const SPRITE_ANIM_1E ; $1e
-	const SPRITE_ANIM_1F ; $1f
-	const SPRITE_ANIM_20 ; $20
-	const SPRITE_ANIM_21 ; $21
-	const SPRITE_ANIM_22 ; $22
-	const SPRITE_ANIM_23 ; $23
-	const SPRITE_ANIM_24 ; $24
-	const SPRITE_ANIM_25 ; $25
-	const SPRITE_ANIM_26 ; $26
-	const SPRITE_ANIM_27 ; $27
-	const SPRITE_ANIM_28 ; $28
-	const SPRITE_ANIM_29 ; $29
-	const SPRITE_ANIM_2A ; $2a
-	const SPRITE_ANIM_2B ; $2b
-	const SPRITE_ANIM_2C ; $2c
-	const SPRITE_ANIM_2D ; $2d
-	const SPRITE_ANIM_2E ; $2e
-	const SPRITE_ANIM_2F ; $2f
-	const SPRITE_ANIM_30 ; $30
-	const SPRITE_ANIM_31 ; $31
-	const SPRITE_ANIM_32 ; $32
-	const SPRITE_ANIM_33 ; $33
-	const SPRITE_ANIM_34 ; $34
-	const SPRITE_ANIM_35 ; $35
-	const SPRITE_ANIM_36 ; $36
-	const SPRITE_ANIM_37 ; $37
-	const SPRITE_ANIM_38 ; $38
-	const SPRITE_ANIM_39 ; $39
-	const SPRITE_ANIM_3A ; $3a
-	const SPRITE_ANIM_3B ; $3b
-	const SPRITE_ANIM_3C ; $3c
-	const SPRITE_ANIM_3D ; $3d
-	const SPRITE_ANIM_3E ; $3e
-	const SPRITE_ANIM_3F ; $3f
-	const SPRITE_ANIM_40 ; $40
-	const SPRITE_ANIM_41 ; $41
-	const SPRITE_ANIM_42 ; $42
-	const SPRITE_ANIM_43 ; $43
-	const SPRITE_ANIM_44 ; $44
-	const SPRITE_ANIM_45 ; $45
-	const SPRITE_ANIM_46 ; $46
-	const SPRITE_ANIM_47 ; $47
-	const SPRITE_ANIM_48 ; $48
-	const SPRITE_ANIM_49 ; $49
-	const SPRITE_ANIM_4A ; $4a
-	const SPRITE_ANIM_4B ; $4b
-	const SPRITE_ANIM_4C ; $4c
-	const SPRITE_ANIM_4D ; $4d
-	const SPRITE_ANIM_4E ; $4e
-	const SPRITE_ANIM_4F ; $4f
-	const SPRITE_ANIM_50 ; $50
-	const SPRITE_ANIM_51 ; $51
-	const SPRITE_ANIM_52 ; $52
-	const SPRITE_ANIM_53 ; $53
-	const SPRITE_ANIM_54 ; $54
-	const SPRITE_ANIM_55 ; $55
-	const SPRITE_ANIM_56 ; $56
-	const SPRITE_ANIM_57 ; $57
-	const SPRITE_ANIM_58 ; $58
-	const SPRITE_ANIM_59 ; $59
-	const SPRITE_ANIM_5A ; $5a
-	const SPRITE_ANIM_5B ; $5b
-	const SPRITE_ANIM_5C ; $5c
-	const SPRITE_ANIM_5D ; $5d
-	const SPRITE_ANIM_5E ; $5e
-	const SPRITE_ANIM_5F ; $5f
-	const SPRITE_ANIM_60 ; $60
-	const SPRITE_ANIM_61 ; $61
-	const SPRITE_ANIM_62 ; $62
-	const SPRITE_ANIM_63 ; $63
-	const SPRITE_ANIM_64 ; $64
-	const SPRITE_ANIM_65 ; $65
-	const SPRITE_ANIM_66 ; $66
-	const SPRITE_ANIM_67 ; $67
-	const SPRITE_ANIM_68 ; $68
-	const SPRITE_ANIM_69 ; $69
-	const SPRITE_ANIM_6A ; $6a
-	const SPRITE_ANIM_6B ; $6b
-	const SPRITE_ANIM_6C ; $6c
-	const SPRITE_ANIM_6D ; $6d
-	const SPRITE_ANIM_6E ; $6e
-	const SPRITE_ANIM_6F ; $6f
-	const SPRITE_ANIM_70 ; $70
-	const SPRITE_ANIM_71 ; $71
-	const SPRITE_ANIM_72 ; $72
-	const SPRITE_ANIM_73 ; $73
-	const SPRITE_ANIM_74 ; $74
-	const SPRITE_ANIM_75 ; $75
-	const SPRITE_ANIM_76 ; $76
-	const SPRITE_ANIM_77 ; $77
-	const SPRITE_ANIM_78 ; $78
-	const SPRITE_ANIM_79 ; $79
-	const SPRITE_ANIM_7A ; $7a
-	const SPRITE_ANIM_7B ; $7b
-	const SPRITE_ANIM_7C ; $7c
-	const SPRITE_ANIM_7D ; $7d
-	const SPRITE_ANIM_7E ; $7e
-	const SPRITE_ANIM_7F ; $7f
-	const SPRITE_ANIM_80 ; $80
-	const SPRITE_ANIM_81 ; $81
-	const SPRITE_ANIM_82 ; $82
-	const SPRITE_ANIM_83 ; $83
-	const SPRITE_ANIM_84 ; $84
-	const SPRITE_ANIM_85 ; $85
-	const SPRITE_ANIM_86 ; $86
-	const SPRITE_ANIM_87 ; $87
-	const SPRITE_ANIM_88 ; $88
-	const SPRITE_ANIM_89 ; $89
-	const SPRITE_ANIM_8A ; $8a
-	const SPRITE_ANIM_8B ; $8b
-	const SPRITE_ANIM_8C ; $8c
-	const SPRITE_ANIM_8D ; $8d
-	const SPRITE_ANIM_8E ; $8e
-	const SPRITE_ANIM_8F ; $8f
-	const SPRITE_ANIM_90 ; $90
-	const SPRITE_ANIM_91 ; $91
-	const SPRITE_ANIM_92 ; $92
-	const SPRITE_ANIM_93 ; $93
-	const SPRITE_ANIM_94 ; $94
-	const SPRITE_ANIM_95 ; $95
-	const SPRITE_ANIM_96 ; $96
-	const SPRITE_ANIM_97 ; $97
-	const SPRITE_ANIM_98 ; $98
-	const SPRITE_ANIM_99 ; $99
-	const SPRITE_ANIM_9A ; $9a
-	const SPRITE_ANIM_9B ; $9b
-	const SPRITE_ANIM_9C ; $9c
-	const SPRITE_ANIM_9D ; $9d
-	const SPRITE_ANIM_9E ; $9e
-	const SPRITE_ANIM_9F ; $9f
-	const SPRITE_ANIM_A0 ; $a0
-	const SPRITE_ANIM_A1 ; $a1
-	const SPRITE_ANIM_A2 ; $a2
-	const SPRITE_ANIM_A3 ; $a3
-	const SPRITE_ANIM_A4 ; $a4
-	const SPRITE_ANIM_A5 ; $a5
-	const SPRITE_ANIM_A6 ; $a6
-	const SPRITE_ANIM_A7 ; $a7
-	const SPRITE_ANIM_A8 ; $a8
-	const SPRITE_ANIM_A9 ; $a9
-	const SPRITE_ANIM_AA ; $aa
-	const SPRITE_ANIM_AB ; $ab
-	const SPRITE_ANIM_AC ; $ac
-	const SPRITE_ANIM_AD ; $ad

src/constants/tileset_constants.asm

@@ -455,12 +455,12 @@
 	const TILESET_1C5 ; $1c5
 	const TILESET_1C6 ; $1c6
 	const TILESET_1C7 ; $1c7
-	const TILESET_1C8 ; $1c8
-	const TILESET_1C9 ; $1c9
-	const TILESET_1CA ; $1ca
-	const TILESET_1CB ; $1cb
+	const TILESET_INTRO_BASE_SET ; $1c8
+	const TILESET_INTRO_JUNGLE ; $1c9
+	const TILESET_INTRO_FOSSIL ; $1ca
+	const TILESET_INTRO_TEAM_ROCKET ; $1cb
 	const TILESET_1CC ; $1cc
-	const TILESET_1CD ; $1cd
+	const TILESET_TITLE_SCREEN ; $1cd
 	const TILESET_1CE ; $1ce
 	const TILESET_1CF ; $1cf
 	const TILESET_1D0 ; $1d0

src/data/gfx_pointers/framesets.asm

@@ -0,0 +1,377 @@
+Framesets:
+	gfx_ptr Frameset000 ; FRAMESET_000
+	gfx_ptr Frameset001 ; FRAMESET_001
+	gfx_ptr Frameset002 ; FRAMESET_002
+	gfx_ptr Frameset003 ; FRAMESET_003
+	gfx_ptr Frameset004 ; FRAMESET_004
+	gfx_ptr Frameset005 ; FRAMESET_005
+	gfx_ptr Frameset006 ; FRAMESET_006
+	gfx_ptr Frameset007 ; FRAMESET_007
+	gfx_ptr Frameset008 ; FRAMESET_008
+	gfx_ptr Frameset009 ; FRAMESET_009
+	gfx_ptr Frameset00A ; FRAMESET_00A
+	gfx_ptr Frameset00B ; FRAMESET_00B
+	gfx_ptr Frameset00C ; FRAMESET_00C
+	gfx_ptr Frameset00D ; FRAMESET_00D
+	gfx_ptr Frameset00E ; FRAMESET_00E
+	gfx_ptr Frameset00F ; FRAMESET_00F
+	gfx_ptr Frameset010 ; FRAMESET_010
+	gfx_ptr Frameset011 ; FRAMESET_011
+	gfx_ptr Frameset012 ; FRAMESET_012
+	gfx_ptr Frameset013 ; FRAMESET_013
+	gfx_ptr Frameset014 ; FRAMESET_014
+	gfx_ptr Frameset015 ; FRAMESET_015
+	gfx_ptr Frameset016 ; FRAMESET_016
+	gfx_ptr Frameset017 ; FRAMESET_017
+	gfx_ptr Frameset018 ; FRAMESET_018
+	gfx_ptr Frameset019 ; FRAMESET_019
+	gfx_ptr Frameset01A ; FRAMESET_01A
+	gfx_ptr Frameset01B ; FRAMESET_01B
+	gfx_ptr Frameset01C ; FRAMESET_01C
+	gfx_ptr Frameset01D ; FRAMESET_01D
+	gfx_ptr Frameset01E ; FRAMESET_01E
+	gfx_ptr Frameset01F ; FRAMESET_01F
+	gfx_ptr Frameset020 ; FRAMESET_020
+	gfx_ptr Frameset021 ; FRAMESET_021
+	gfx_ptr Frameset022 ; FRAMESET_022
+	gfx_ptr Frameset023 ; FRAMESET_023
+	gfx_ptr Frameset024 ; FRAMESET_024
+	gfx_ptr Frameset025 ; FRAMESET_025
+	gfx_ptr Frameset026 ; FRAMESET_026
+	gfx_ptr Frameset027 ; FRAMESET_027
+	gfx_ptr Frameset028 ; FRAMESET_028
+	gfx_ptr Frameset029 ; FRAMESET_029
+	gfx_ptr Frameset02A ; FRAMESET_02A
+	gfx_ptr Frameset02B ; FRAMESET_02B
+	gfx_ptr Frameset02C ; FRAMESET_02C
+	gfx_ptr Frameset02D ; FRAMESET_02D
+	gfx_ptr Frameset02E ; FRAMESET_02E
+	gfx_ptr Frameset02F ; FRAMESET_02F
+	gfx_ptr Frameset030 ; FRAMESET_030
+	gfx_ptr Frameset031 ; FRAMESET_031
+	gfx_ptr Frameset032 ; FRAMESET_032
+	gfx_ptr Frameset033 ; FRAMESET_033
+	gfx_ptr Frameset034 ; FRAMESET_034
+	gfx_ptr Frameset035 ; FRAMESET_035
+	gfx_ptr Frameset036 ; FRAMESET_036
+	gfx_ptr Frameset037 ; FRAMESET_037
+	gfx_ptr Frameset038 ; FRAMESET_038
+	gfx_ptr Frameset039 ; FRAMESET_039
+	gfx_ptr Frameset03A ; FRAMESET_03A
+	gfx_ptr Frameset03B ; FRAMESET_03B
+	gfx_ptr Frameset03C ; FRAMESET_03C
+	gfx_ptr Frameset03D ; FRAMESET_03D
+	gfx_ptr Frameset03E ; FRAMESET_03E
+	gfx_ptr Frameset03F ; FRAMESET_03F
+	gfx_ptr Frameset040 ; FRAMESET_040
+	gfx_ptr Frameset041 ; FRAMESET_041
+	gfx_ptr Frameset042 ; FRAMESET_042
+	gfx_ptr Frameset043 ; FRAMESET_043
+	gfx_ptr Frameset044 ; FRAMESET_044
+	gfx_ptr Frameset045 ; FRAMESET_045
+	gfx_ptr Frameset046 ; FRAMESET_046
+	gfx_ptr Frameset047 ; FRAMESET_047
+	gfx_ptr Frameset048 ; FRAMESET_048
+	gfx_ptr Frameset049 ; FRAMESET_049
+	gfx_ptr Frameset04A ; FRAMESET_04A
+	gfx_ptr Frameset04B ; FRAMESET_04B
+	gfx_ptr Frameset04C ; FRAMESET_04C
+	gfx_ptr Frameset04D ; FRAMESET_04D
+	gfx_ptr Frameset04E ; FRAMESET_04E
+	gfx_ptr Frameset04F ; FRAMESET_04F
+	gfx_ptr Frameset050 ; FRAMESET_050
+	gfx_ptr Frameset051 ; FRAMESET_051
+	gfx_ptr Frameset052 ; FRAMESET_052
+	gfx_ptr Frameset053 ; FRAMESET_053
+	gfx_ptr Frameset054 ; FRAMESET_054
+	gfx_ptr Frameset055 ; FRAMESET_055
+	gfx_ptr Frameset056 ; FRAMESET_056
+	gfx_ptr Frameset057 ; FRAMESET_057
+	gfx_ptr Frameset058 ; FRAMESET_058
+	gfx_ptr Frameset059 ; FRAMESET_059
+	gfx_ptr Frameset05A ; FRAMESET_05A
+	gfx_ptr Frameset05B ; FRAMESET_05B
+	gfx_ptr Frameset05C ; FRAMESET_05C
+	gfx_ptr Frameset05D ; FRAMESET_05D
+	gfx_ptr Frameset05E ; FRAMESET_05E
+	gfx_ptr Frameset05F ; FRAMESET_05F
+	gfx_ptr Frameset060 ; FRAMESET_060
+	gfx_ptr Frameset061 ; FRAMESET_061
+	gfx_ptr Frameset062 ; FRAMESET_062
+	gfx_ptr Frameset063 ; FRAMESET_063
+	gfx_ptr Frameset064 ; FRAMESET_064
+	gfx_ptr Frameset065 ; FRAMESET_065
+	gfx_ptr Frameset066 ; FRAMESET_066
+	gfx_ptr Frameset067 ; FRAMESET_067
+	gfx_ptr Frameset068 ; FRAMESET_068
+	gfx_ptr Frameset069 ; FRAMESET_069
+	gfx_ptr Frameset06A ; FRAMESET_06A
+	gfx_ptr Frameset06B ; FRAMESET_06B
+	gfx_ptr Frameset06C ; FRAMESET_06C
+	gfx_ptr Frameset06D ; FRAMESET_06D
+	gfx_ptr Frameset06E ; FRAMESET_06E
+	gfx_ptr Frameset06F ; FRAMESET_06F
+	gfx_ptr Frameset070 ; FRAMESET_070
+	gfx_ptr Frameset071 ; FRAMESET_071
+	gfx_ptr Frameset072 ; FRAMESET_072
+	gfx_ptr Frameset073 ; FRAMESET_073
+	gfx_ptr Frameset074 ; FRAMESET_074
+	gfx_ptr Frameset075 ; FRAMESET_075
+	gfx_ptr Frameset076 ; FRAMESET_076
+	gfx_ptr Frameset077 ; FRAMESET_077
+	gfx_ptr Frameset078 ; FRAMESET_078
+	gfx_ptr Frameset079 ; FRAMESET_079
+	gfx_ptr Frameset07A ; FRAMESET_07A
+	gfx_ptr Frameset07B ; FRAMESET_07B
+	gfx_ptr Frameset07C ; FRAMESET_07C
+	gfx_ptr Frameset07D ; FRAMESET_07D
+	gfx_ptr Frameset07E ; FRAMESET_07E
+	gfx_ptr Frameset07F ; FRAMESET_07F
+	gfx_ptr Frameset080 ; FRAMESET_080
+	gfx_ptr Frameset081 ; FRAMESET_081
+	gfx_ptr Frameset082 ; FRAMESET_082
+	gfx_ptr Frameset083 ; FRAMESET_083
+	gfx_ptr Frameset084 ; FRAMESET_084
+	gfx_ptr Frameset085 ; FRAMESET_085
+	gfx_ptr Frameset086 ; FRAMESET_086
+	gfx_ptr Frameset087 ; FRAMESET_087
+	gfx_ptr Frameset088 ; FRAMESET_088
+	gfx_ptr Frameset089 ; FRAMESET_089
+	gfx_ptr Frameset08A ; FRAMESET_08A
+	gfx_ptr Frameset08B ; FRAMESET_08B
+	gfx_ptr Frameset08C ; FRAMESET_08C
+	gfx_ptr Frameset08D ; FRAMESET_08D
+	gfx_ptr Frameset08E ; FRAMESET_08E
+	gfx_ptr Frameset08F ; FRAMESET_08F
+	gfx_ptr Frameset090 ; FRAMESET_090
+	gfx_ptr Frameset091 ; FRAMESET_091
+	gfx_ptr Frameset092 ; FRAMESET_092
+	gfx_ptr Frameset093 ; FRAMESET_093
+	gfx_ptr Frameset094 ; FRAMESET_094
+	gfx_ptr Frameset095 ; FRAMESET_095
+	gfx_ptr Frameset096 ; FRAMESET_096
+	gfx_ptr Frameset097 ; FRAMESET_097
+	gfx_ptr Frameset098 ; FRAMESET_098
+	gfx_ptr Frameset099 ; FRAMESET_099
+	gfx_ptr Frameset09A ; FRAMESET_09A
+	gfx_ptr Frameset09B ; FRAMESET_09B
+	gfx_ptr Frameset09C ; FRAMESET_09C
+	gfx_ptr Frameset09D ; FRAMESET_09D
+	gfx_ptr Frameset09E ; FRAMESET_09E
+	gfx_ptr Frameset09F ; FRAMESET_09F
+	gfx_ptr Frameset0A0 ; FRAMESET_0A0
+	gfx_ptr Frameset0A1 ; FRAMESET_0A1
+	gfx_ptr Frameset0A2 ; FRAMESET_0A2
+	gfx_ptr Frameset0A3 ; FRAMESET_0A3
+	gfx_ptr Frameset0A4 ; FRAMESET_0A4
+	gfx_ptr Frameset0A5 ; FRAMESET_0A5
+	gfx_ptr Frameset0A6 ; FRAMESET_0A6
+	gfx_ptr Frameset0A7 ; FRAMESET_0A7
+	gfx_ptr Frameset0A8 ; FRAMESET_0A8
+	gfx_ptr Frameset0A9 ; FRAMESET_0A9
+	gfx_ptr Frameset0AA ; FRAMESET_0AA
+	gfx_ptr Frameset0AB ; FRAMESET_0AB
+	gfx_ptr Frameset0AC ; FRAMESET_0AC
+	gfx_ptr Frameset0AD ; FRAMESET_0AD
+	gfx_ptr Frameset0AE ; FRAMESET_0AE
+	gfx_ptr Frameset0AF ; FRAMESET_0AF
+	gfx_ptr Frameset0B0 ; FRAMESET_0B0
+	gfx_ptr Frameset0B1 ; FRAMESET_0B1
+	gfx_ptr Frameset0B2 ; FRAMESET_0B2
+	gfx_ptr Frameset0B3 ; FRAMESET_0B3
+	gfx_ptr Frameset0B4 ; FRAMESET_0B4
+	gfx_ptr Frameset0B5 ; FRAMESET_0B5
+	gfx_ptr Frameset0B6 ; FRAMESET_0B6
+	gfx_ptr Frameset0B7 ; FRAMESET_0B7
+	gfx_ptr Frameset0B8 ; FRAMESET_0B8
+	gfx_ptr Frameset0B9 ; FRAMESET_0B9
+	gfx_ptr Frameset0BA ; FRAMESET_0BA
+	gfx_ptr Frameset0BB ; FRAMESET_0BB
+	gfx_ptr Frameset0BC ; FRAMESET_0BC
+	gfx_ptr Frameset0BD ; FRAMESET_0BD
+	gfx_ptr Frameset0BE ; FRAMESET_0BE
+	gfx_ptr Frameset0BF ; FRAMESET_0BF
+	gfx_ptr Frameset0C0 ; FRAMESET_0C0
+	gfx_ptr Frameset0C1 ; FRAMESET_0C1
+	gfx_ptr Frameset0C2 ; FRAMESET_0C2
+	gfx_ptr Frameset0C3 ; FRAMESET_0C3
+	gfx_ptr Frameset0C4 ; FRAMESET_0C4
+	gfx_ptr Frameset0C5 ; FRAMESET_0C5
+	gfx_ptr Frameset0C6 ; FRAMESET_0C6
+	gfx_ptr Frameset0C7 ; FRAMESET_0C7
+	gfx_ptr Frameset0C8 ; FRAMESET_0C8
+	gfx_ptr Frameset0C9 ; FRAMESET_0C9
+	gfx_ptr Frameset0CA ; FRAMESET_0CA
+	gfx_ptr Frameset0CB ; FRAMESET_0CB
+	gfx_ptr Frameset0CC ; FRAMESET_0CC
+	gfx_ptr Frameset0CD ; FRAMESET_0CD
+	gfx_ptr Frameset0CE ; FRAMESET_0CE
+	gfx_ptr Frameset0CF ; FRAMESET_0CF
+	gfx_ptr Frameset0D0 ; FRAMESET_0D0
+	gfx_ptr Frameset0D1 ; FRAMESET_0D1
+	gfx_ptr Frameset0D2 ; FRAMESET_0D2
+	gfx_ptr Frameset0D3 ; FRAMESET_0D3
+	gfx_ptr Frameset0D4 ; FRAMESET_0D4
+	gfx_ptr Frameset0D5 ; FRAMESET_0D5
+	gfx_ptr Frameset0D6 ; FRAMESET_0D6
+	gfx_ptr Frameset0D7 ; FRAMESET_0D7
+	gfx_ptr Frameset0D8 ; FRAMESET_0D8
+	gfx_ptr Frameset0D9 ; FRAMESET_0D9
+	gfx_ptr Frameset0DA ; FRAMESET_0DA
+	gfx_ptr Frameset0DB ; FRAMESET_0DB
+	gfx_ptr Frameset0DC ; FRAMESET_0DC
+	gfx_ptr Frameset0DD ; FRAMESET_0DD
+	gfx_ptr Frameset0DE ; FRAMESET_0DE
+	gfx_ptr Frameset0DF ; FRAMESET_0DF
+	gfx_ptr Frameset0E0 ; FRAMESET_0E0
+	gfx_ptr Frameset0E1 ; FRAMESET_0E1
+	gfx_ptr Frameset0E2 ; FRAMESET_0E2
+	gfx_ptr Frameset0E3 ; FRAMESET_0E3
+	gfx_ptr Frameset0E4 ; FRAMESET_0E4
+	gfx_ptr Frameset0E5 ; FRAMESET_0E5
+	gfx_ptr Frameset0E6 ; FRAMESET_0E6
+	gfx_ptr Frameset0E7 ; FRAMESET_0E7
+	gfx_ptr Frameset0E8 ; FRAMESET_0E8
+	gfx_ptr Frameset0E9 ; FRAMESET_0E9
+	gfx_ptr Frameset0EA ; FRAMESET_0EA
+	gfx_ptr Frameset0EB ; FRAMESET_0EB
+	gfx_ptr Frameset0EC ; FRAMESET_0EC
+	gfx_ptr Frameset0ED ; FRAMESET_0ED
+	gfx_ptr Frameset0EE ; FRAMESET_0EE
+	gfx_ptr Frameset0EF ; FRAMESET_0EF
+	gfx_ptr Frameset0F0 ; FRAMESET_0F0
+	gfx_ptr Frameset0F1 ; FRAMESET_0F1
+	gfx_ptr Frameset0F2 ; FRAMESET_0F2
+	gfx_ptr Frameset0F3 ; FRAMESET_0F3
+	gfx_ptr Frameset0F4 ; FRAMESET_0F4
+	gfx_ptr Frameset0F5 ; FRAMESET_0F5
+	gfx_ptr Frameset0F6 ; FRAMESET_0F6
+	gfx_ptr Frameset0F7 ; FRAMESET_0F7
+	gfx_ptr Frameset0F8 ; FRAMESET_0F8
+	gfx_ptr Frameset0F9 ; FRAMESET_0F9
+	gfx_ptr Frameset0FA ; FRAMESET_0FA
+	gfx_ptr Frameset0FB ; FRAMESET_0FB
+	gfx_ptr Frameset0FC ; FRAMESET_0FC
+	gfx_ptr Frameset0FD ; FRAMESET_0FD
+	gfx_ptr Frameset0FE ; FRAMESET_0FE
+	gfx_ptr Frameset0FF ; FRAMESET_0FF
+	gfx_ptr Frameset100 ; FRAMESET_100
+	gfx_ptr Frameset101 ; FRAMESET_101
+	gfx_ptr Frameset102 ; FRAMESET_102
+	gfx_ptr Frameset103 ; FRAMESET_103
+	gfx_ptr Frameset104 ; FRAMESET_104
+	gfx_ptr Frameset105 ; FRAMESET_105
+	gfx_ptr Frameset106 ; FRAMESET_106
+	gfx_ptr Frameset107 ; FRAMESET_107
+	gfx_ptr Frameset108 ; FRAMESET_108
+	gfx_ptr Frameset109 ; FRAMESET_109
+	gfx_ptr Frameset10A ; FRAMESET_10A
+	gfx_ptr Frameset10B ; FRAMESET_10B
+	gfx_ptr Frameset10C ; FRAMESET_10C
+	gfx_ptr Frameset10D ; FRAMESET_10D
+	gfx_ptr Frameset10E ; FRAMESET_10E
+	gfx_ptr Frameset10F ; FRAMESET_10F
+	gfx_ptr Frameset110 ; FRAMESET_110
+	gfx_ptr Frameset111 ; FRAMESET_111
+	gfx_ptr Frameset112 ; FRAMESET_112
+	gfx_ptr Frameset113 ; FRAMESET_113
+	gfx_ptr Frameset114 ; FRAMESET_114
+	gfx_ptr Frameset115 ; FRAMESET_115
+	gfx_ptr Frameset116 ; FRAMESET_116
+	gfx_ptr Frameset117 ; FRAMESET_117
+	gfx_ptr Frameset118 ; FRAMESET_118
+	gfx_ptr Frameset119 ; FRAMESET_119
+	gfx_ptr Frameset11A ; FRAMESET_11A
+	gfx_ptr Frameset11B ; FRAMESET_11B
+	gfx_ptr Frameset11C ; FRAMESET_11C
+	gfx_ptr Frameset11D ; FRAMESET_11D
+	gfx_ptr Frameset11E ; FRAMESET_11E
+	gfx_ptr Frameset11F ; FRAMESET_11F
+	gfx_ptr Frameset120 ; FRAMESET_120
+	gfx_ptr Frameset121 ; FRAMESET_121
+	gfx_ptr Frameset122 ; FRAMESET_122
+	gfx_ptr Frameset123 ; FRAMESET_123
+	gfx_ptr Frameset124 ; FRAMESET_124
+	gfx_ptr Frameset125 ; FRAMESET_125
+	gfx_ptr Frameset126 ; FRAMESET_126
+	gfx_ptr Frameset127 ; FRAMESET_127
+	gfx_ptr Frameset128 ; FRAMESET_128
+	gfx_ptr Frameset129 ; FRAMESET_129
+	gfx_ptr Frameset12A ; FRAMESET_12A
+	gfx_ptr Frameset12B ; FRAMESET_12B
+	gfx_ptr Frameset12C ; FRAMESET_12C
+	gfx_ptr Frameset12D ; FRAMESET_12D
+	gfx_ptr Frameset12E ; FRAMESET_12E
+	gfx_ptr Frameset12F ; FRAMESET_12F
+	gfx_ptr Frameset130 ; FRAMESET_130
+	gfx_ptr Frameset131 ; FRAMESET_131
+	gfx_ptr Frameset132 ; FRAMESET_132
+	gfx_ptr Frameset133 ; FRAMESET_133
+	gfx_ptr Frameset134 ; FRAMESET_134
+	gfx_ptr Frameset135 ; FRAMESET_135
+	gfx_ptr Frameset136 ; FRAMESET_136
+	gfx_ptr Frameset137 ; FRAMESET_137
+	gfx_ptr Frameset138 ; FRAMESET_138
+	gfx_ptr Frameset139 ; FRAMESET_139
+	gfx_ptr Frameset13A ; FRAMESET_13A
+	gfx_ptr Frameset13B ; FRAMESET_13B
+	gfx_ptr Frameset13C ; FRAMESET_13C
+	gfx_ptr Frameset13D ; FRAMESET_13D
+	gfx_ptr Frameset13E ; FRAMESET_13E
+	gfx_ptr Frameset13F ; FRAMESET_13F
+	gfx_ptr Frameset140 ; FRAMESET_140
+	gfx_ptr Frameset141 ; FRAMESET_141
+	gfx_ptr Frameset142 ; FRAMESET_142
+	gfx_ptr Frameset143 ; FRAMESET_143
+	gfx_ptr Frameset144 ; FRAMESET_144
+	gfx_ptr Frameset145 ; FRAMESET_145
+	gfx_ptr Frameset146 ; FRAMESET_146
+	gfx_ptr Frameset147 ; FRAMESET_147
+	gfx_ptr Frameset148 ; FRAMESET_148
+	gfx_ptr Frameset149 ; FRAMESET_149
+	gfx_ptr Frameset14A ; FRAMESET_14A
+	gfx_ptr Frameset14B ; FRAMESET_14B
+	gfx_ptr Frameset14C ; FRAMESET_14C
+	gfx_ptr Frameset14D ; FRAMESET_14D
+	gfx_ptr Frameset14E ; FRAMESET_14E
+	gfx_ptr Frameset14F ; FRAMESET_14F
+	gfx_ptr Frameset150 ; FRAMESET_150
+	gfx_ptr Frameset151 ; FRAMESET_151
+	gfx_ptr Frameset152 ; FRAMESET_152
+	gfx_ptr Frameset153 ; FRAMESET_153
+	gfx_ptr Frameset154 ; FRAMESET_154
+	gfx_ptr Frameset155 ; FRAMESET_155
+	gfx_ptr Frameset156 ; FRAMESET_156
+	gfx_ptr Frameset157 ; FRAMESET_157
+	gfx_ptr Frameset158 ; FRAMESET_158
+	gfx_ptr Frameset159 ; FRAMESET_159
+	gfx_ptr Frameset15A ; FRAMESET_15A
+	gfx_ptr Frameset15B ; FRAMESET_15B
+	gfx_ptr Frameset15C ; FRAMESET_15C
+	gfx_ptr Frameset15D ; FRAMESET_15D
+	gfx_ptr Frameset15E ; FRAMESET_15E
+	gfx_ptr Frameset15F ; FRAMESET_15F
+	gfx_ptr Frameset160 ; FRAMESET_160
+	gfx_ptr Frameset161 ; FRAMESET_161
+	gfx_ptr Frameset162 ; FRAMESET_162
+	gfx_ptr Frameset163 ; FRAMESET_163
+	gfx_ptr Frameset164 ; FRAMESET_164
+	gfx_ptr Frameset165 ; FRAMESET_165
+	gfx_ptr Frameset166 ; FRAMESET_166
+	gfx_ptr Frameset167 ; FRAMESET_167
+	gfx_ptr Frameset168 ; FRAMESET_168
+	gfx_ptr Frameset169 ; FRAMESET_169
+	gfx_ptr Frameset16A ; FRAMESET_16A
+	gfx_ptr Frameset16B ; FRAMESET_16B
+	gfx_ptr Frameset16C ; FRAMESET_16C
+	gfx_ptr Frameset16D ; FRAMESET_16D
+	gfx_ptr Frameset16E ; FRAMESET_16E
+	gfx_ptr Frameset16F ; FRAMESET_16F
+	gfx_ptr Frameset170 ; FRAMESET_170
+	gfx_ptr Frameset171 ; FRAMESET_171
+	gfx_ptr Frameset172 ; FRAMESET_172
+	gfx_ptr Frameset173 ; FRAMESET_173
+	gfx_ptr Frameset174 ; FRAMESET_174
+	gfx_ptr Frameset175 ; FRAMESET_175
+	gfx_ptr Frameset176 ; FRAMESET_176
+	gfx_ptr Frameset177 ; FRAMESET_177

src/data/gfx_pointers/gfx_unknown3.asm

@@ -1,753 +0,0 @@
-GfxUnknown3:
-	dbw $29, $6820 ; $000
-	db $0
-	dbw $29, $684c ; $001
-	db $0
-	dbw $29, $6864 ; $002
-	db $0
-	dbw $29, $6898 ; $003
-	db $0
-	dbw $29, $68c0 ; $004
-	db $0
-	dbw $29, $68d8 ; $005
-	db $0
-	dbw $29, $68f4 ; $006
-	db $0
-	dbw $29, $6910 ; $007
-	db $0
-	dbw $29, $6934 ; $008
-	db $0
-	dbw $29, $69b8 ; $009
-	db $0
-	dbw $29, $6a3c ; $00a
-	db $0
-	dbw $29, $6ac0 ; $00b
-	db $0
-	dbw $29, $6b44 ; $00c
-	db $0
-	dbw $29, $6bc8 ; $00d
-	db $0
-	dbw $29, $6c4c ; $00e
-	db $0
-	dbw $29, $6cd0 ; $00f
-	db $0
-	dbw $29, $6d54 ; $010
-	db $0
-	dbw $29, $6dd8 ; $011
-	db $0
-	dbw $29, $6e5c ; $012
-	db $0
-	dbw $29, $6ee0 ; $013
-	db $0
-	dbw $29, $6f64 ; $014
-	db $0
-	dbw $29, $6fe8 ; $015
-	db $0
-	dbw $29, $7020 ; $016
-	db $0
-	dbw $29, $7058 ; $017
-	db $0
-	dbw $29, $7084 ; $018
-	db $0
-	dbw $29, $70bc ; $019
-	db $0
-	dbw $29, $70f8 ; $01a
-	db $0
-	dbw $29, $7140 ; $01b
-	db $0
-	dbw $29, $71e8 ; $01c
-	db $0
-	dbw $29, $725c ; $01d
-	db $0
-	dbw $29, $7288 ; $01e
-	db $0
-	dbw $29, $7298 ; $01f
-	db $0
-	dbw $29, $72fc ; $020
-	db $0
-	dbw $29, $736c ; $021
-	db $0
-	dbw $29, $73b8 ; $022
-	db $0
-	dbw $29, $7408 ; $023
-	db $0
-	dbw $29, $7458 ; $024
-	db $0
-	dbw $29, $7484 ; $025
-	db $0
-	dbw $29, $7500 ; $026
-	db $0
-	dbw $29, $7590 ; $027
-	db $0
-	dbw $29, $75b0 ; $028
-	db $0
-	dbw $29, $75ec ; $029
-	db $0
-	dbw $29, $7634 ; $02a
-	db $0
-	dbw $29, $7658 ; $02b
-	db $0
-	dbw $29, $769c ; $02c
-	db $0
-	dbw $29, $76dc ; $02d
-	db $0
-	dbw $29, $7744 ; $02e
-	db $0
-	dbw $29, $77bc ; $02f
-	db $0
-	dbw $29, $780c ; $030
-	db $0
-	dbw $29, $7834 ; $031
-	db $0
-	dbw $29, $7884 ; $032
-	db $0
-	dbw $29, $78b0 ; $033
-	db $0
-	dbw $29, $7914 ; $034
-	db $0
-	dbw $29, $79a0 ; $035
-	db $0
-	dbw $29, $79e0 ; $036
-	db $0
-	dbw $29, $7aac ; $037
-	db $0
-	dbw $29, $7af8 ; $038
-	db $0
-	dbw $29, $7b24 ; $039
-	db $0
-	dbw $29, $7b78 ; $03a
-	db $0
-	dbw $29, $7bc4 ; $03b
-	db $0
-	dbw $29, $7c18 ; $03c
-	db $0
-	dbw $29, $7c78 ; $03d
-	db $0
-	dbw $29, $7cb0 ; $03e
-	db $0
-	dbw $29, $7cf4 ; $03f
-	db $0
-	dbw $29, $7d1c ; $040
-	db $0
-	dbw $29, $7d64 ; $041
-	db $0
-	dbw $29, $7d8c ; $042
-	db $0
-	dbw $29, $7dd4 ; $043
-	db $0
-	dbw $29, $7e40 ; $044
-	db $0
-	dbw $29, $7e84 ; $045
-	db $0
-	dbw $29, $7ed0 ; $046
-	db $0
-	dbw $29, $7f0c ; $047
-	db $0
-	dbw $29, $7f60 ; $048
-	db $0
-	dbw $2a, $4000 ; $049
-	db $0
-	dbw $29, $7f8c ; $04a
-	db $0
-	dbw $2a, $4080 ; $04b
-	db $0
-	dbw $29, $7fd8 ; $04c
-	db $0
-	dbw $29, $7fec ; $04d
-	db $0
-	dbw $2a, $40e0 ; $04e
-	db $0
-	dbw $2a, $40f8 ; $04f
-	db $0
-	dbw $2a, $414c ; $050
-	db $0
-	dbw $2a, $41b8 ; $051
-	db $0
-	dbw $2a, $420c ; $052
-	db $0
-	dbw $2a, $4238 ; $053
-	db $0
-	dbw $2a, $4274 ; $054
-	db $0
-	dbw $2a, $429c ; $055
-	db $0
-	dbw $2a, $434c ; $056
-	db $0
-	dbw $2a, $4384 ; $057
-	db $0
-	dbw $2a, $43d8 ; $058
-	db $0
-	dbw $2a, $4420 ; $059
-	db $0
-	dbw $2a, $4454 ; $05a
-	db $0
-	dbw $2a, $4488 ; $05b
-	db $0
-	dbw $2a, $44ec ; $05c
-	db $0
-	dbw $2a, $4538 ; $05d
-	db $0
-	dbw $2a, $4600 ; $05e
-	db $0
-	dbw $2a, $4668 ; $05f
-	db $0
-	dbw $2a, $4708 ; $060
-	db $0
-	dbw $2a, $4738 ; $061
-	db $0
-	dbw $2a, $475c ; $062
-	db $0
-	dbw $2a, $4790 ; $063
-	db $0
-	dbw $2a, $47c8 ; $064
-	db $0
-	dbw $2a, $4828 ; $065
-	db $0
-	dbw $2a, $48a4 ; $066
-	db $0
-	dbw $2a, $48d4 ; $067
-	db $0
-	dbw $2a, $48ec ; $068
-	db $0
-	dbw $2a, $4998 ; $069
-	db $0
-	dbw $2a, $49dc ; $06a
-	db $0
-	dbw $2a, $4a40 ; $06b
-	db $0
-	dbw $2a, $4a78 ; $06c
-	db $0
-	dbw $2a, $4ac4 ; $06d
-	db $0
-	dbw $2a, $4b04 ; $06e
-	db $0
-	dbw $2a, $4b40 ; $06f
-	db $0
-	dbw $2a, $4b8c ; $070
-	db $0
-	dbw $2a, $4bdc ; $071
-	db $0
-	dbw $2a, $4c34 ; $072
-	db $0
-	dbw $2a, $4c68 ; $073
-	db $0
-	dbw $2a, $4cc4 ; $074
-	db $0
-	dbw $2a, $4cfc ; $075
-	db $0
-	dbw $2a, $4d44 ; $076
-	db $0
-	dbw $2a, $4db0 ; $077
-	db $0
-	dbw $2a, $4e20 ; $078
-	db $0
-	dbw $2a, $4e68 ; $079
-	db $0
-	dbw $2a, $4e90 ; $07a
-	db $0
-	dbw $2a, $4eb8 ; $07b
-	db $0
-	dbw $2a, $4ee0 ; $07c
-	db $0
-	dbw $2a, $4f08 ; $07d
-	db $0
-	dbw $2a, $4f1c ; $07e
-	db $0
-	dbw $2a, $4f3c ; $07f
-	db $0
-	dbw $2a, $4f5c ; $080
-	db $0
-	dbw $01, $7853 ; $081
-	db $0
-	dbw $2a, $4f7c ; $082
-	db $0
-	dbw $2a, $4fa0 ; $083
-	db $0
-	dbw $2a, $502c ; $084
-	db $0
-	dbw $06, $7ff8 ; $085
-	db $0
-	dbw $0b, $7ff8 ; $086
-	db $0
-	dbw $2a, $50b8 ; $087
-	db $0
-	dbw $2a, $50c4 ; $088
-	db $0
-	dbw $2a, $50d0 ; $089
-	db $0
-	dbw $2a, $50dc ; $08a
-	db $0
-	dbw $2a, $50f0 ; $08b
-	db $0
-	dbw $2a, $50fc ; $08c
-	db $0
-	dbw $2a, $5110 ; $08d
-	db $0
-	dbw $2a, $511c ; $08e
-	db $0
-	dbw $2a, $5130 ; $08f
-	db $0
-	dbw $2a, $513c ; $090
-	db $0
-	dbw $2a, $5150 ; $091
-	db $0
-	dbw $2a, $515c ; $092
-	db $0
-	dbw $2a, $5170 ; $093
-	db $0
-	dbw $2a, $517c ; $094
-	db $0
-	dbw $2a, $5190 ; $095
-	db $0
-	dbw $2a, $519c ; $096
-	db $0
-	dbw $2a, $51b0 ; $097
-	db $0
-	dbw $2a, $51bc ; $098
-	db $0
-	dbw $2a, $51d0 ; $099
-	db $0
-	dbw $2a, $51dc ; $09a
-	db $0
-	dbw $2a, $51f0 ; $09b
-	db $0
-	dbw $2a, $51fc ; $09c
-	db $0
-	dbw $2a, $5210 ; $09d
-	db $0
-	dbw $2a, $521c ; $09e
-	db $0
-	dbw $2a, $5230 ; $09f
-	db $0
-	dbw $2a, $523c ; $0a0
-	db $0
-	dbw $2a, $5250 ; $0a1
-	db $0
-	dbw $2a, $525c ; $0a2
-	db $0
-	dbw $2a, $5270 ; $0a3
-	db $0
-	dbw $2a, $527c ; $0a4
-	db $0
-	dbw $2a, $5290 ; $0a5
-	db $0
-	dbw $2a, $529c ; $0a6
-	db $0
-	dbw $2a, $52b0 ; $0a7
-	db $0
-	dbw $2a, $52bc ; $0a8
-	db $0
-	dbw $2a, $52d0 ; $0a9
-	db $0
-	dbw $2a, $52dc ; $0aa
-	db $0
-	dbw $2a, $52f0 ; $0ab
-	db $0
-	dbw $2a, $52fc ; $0ac
-	db $0
-	dbw $2a, $5310 ; $0ad
-	db $0
-	dbw $2a, $531c ; $0ae
-	db $0
-	dbw $2a, $5330 ; $0af
-	db $0
-	dbw $2a, $537c ; $0b0
-	db $0
-	dbw $2a, $5390 ; $0b1
-	db $0
-	dbw $2a, $539c ; $0b2
-	db $0
-	dbw $2a, $53b0 ; $0b3
-	db $0
-	dbw $2a, $53bc ; $0b4
-	db $0
-	dbw $2a, $53d0 ; $0b5
-	db $0
-	dbw $2a, $541c ; $0b6
-	db $0
-	dbw $2a, $5430 ; $0b7
-	db $0
-	dbw $2a, $543c ; $0b8
-	db $0
-	dbw $2a, $5450 ; $0b9
-	db $0
-	dbw $2a, $545c ; $0ba
-	db $0
-	dbw $2a, $5470 ; $0bb
-	db $0
-	dbw $2a, $547c ; $0bc
-	db $0
-	dbw $2a, $5490 ; $0bd
-	db $0
-	dbw $0c, $7ff8 ; $0be
-	db $0
-	dbw $2a, $549c ; $0bf
-	db $0
-	dbw $2a, $54b0 ; $0c0
-	db $0
-	dbw $2a, $54bc ; $0c1
-	db $0
-	dbw $2a, $54d0 ; $0c2
-	db $0
-	dbw $2a, $54dc ; $0c3
-	db $0
-	dbw $2a, $54f0 ; $0c4
-	db $0
-	dbw $2a, $54fc ; $0c5
-	db $0
-	dbw $2a, $5510 ; $0c6
-	db $0
-	dbw $2a, $551c ; $0c7
-	db $0
-	dbw $2a, $5530 ; $0c8
-	db $0
-	dbw $2a, $553c ; $0c9
-	db $0
-	dbw $2a, $5550 ; $0ca
-	db $0
-	dbw $2a, $555c ; $0cb
-	db $0
-	dbw $2a, $5570 ; $0cc
-	db $0
-	dbw $2a, $557c ; $0cd
-	db $0
-	dbw $2a, $5590 ; $0ce
-	db $0
-	dbw $2a, $559c ; $0cf
-	db $0
-	dbw $2a, $55b0 ; $0d0
-	db $0
-	dbw $2a, $55bc ; $0d1
-	db $0
-	dbw $2a, $55d0 ; $0d2
-	db $0
-	dbw $2a, $55dc ; $0d3
-	db $0
-	dbw $2a, $55f0 ; $0d4
-	db $0
-	dbw $2a, $55fc ; $0d5
-	db $0
-	dbw $2a, $5610 ; $0d6
-	db $0
-	dbw $2a, $561c ; $0d7
-	db $0
-	dbw $2a, $5630 ; $0d8
-	db $0
-	dbw $2a, $563c ; $0d9
-	db $0
-	dbw $2a, $5650 ; $0da
-	db $0
-	dbw $2a, $565c ; $0db
-	db $0
-	dbw $2a, $5670 ; $0dc
-	db $0
-	dbw $2a, $567c ; $0dd
-	db $0
-	dbw $2a, $5690 ; $0de
-	db $0
-	dbw $2a, $569c ; $0df
-	db $0
-	dbw $2a, $56b0 ; $0e0
-	db $0
-	dbw $2a, $56bc ; $0e1
-	db $0
-	dbw $2a, $56d0 ; $0e2
-	db $0
-	dbw $2a, $56dc ; $0e3
-	db $0
-	dbw $2a, $56f0 ; $0e4
-	db $0
-	dbw $2a, $56fc ; $0e5
-	db $0
-	dbw $2a, $5710 ; $0e6
-	db $0
-	dbw $2a, $571c ; $0e7
-	db $0
-	dbw $2a, $5730 ; $0e8
-	db $0
-	dbw $2a, $573c ; $0e9
-	db $0
-	dbw $2a, $5750 ; $0ea
-	db $0
-	dbw $2a, $575c ; $0eb
-	db $0
-	dbw $2a, $5770 ; $0ec
-	db $0
-	dbw $2a, $577c ; $0ed
-	db $0
-	dbw $2a, $5790 ; $0ee
-	db $0
-	dbw $2a, $579c ; $0ef
-	db $0
-	dbw $2a, $57b0 ; $0f0
-	db $0
-	dbw $2a, $57bc ; $0f1
-	db $0
-	dbw $2a, $57d0 ; $0f2
-	db $0
-	dbw $2a, $57dc ; $0f3
-	db $0
-	dbw $2a, $57f0 ; $0f4
-	db $0
-	dbw $2a, $57fc ; $0f5
-	db $0
-	dbw $2a, $5810 ; $0f6
-	db $0
-	dbw $2a, $581c ; $0f7
-	db $0
-	dbw $2a, $5830 ; $0f8
-	db $0
-	dbw $2a, $583c ; $0f9
-	db $0
-	dbw $2a, $5850 ; $0fa
-	db $0
-	dbw $2a, $585c ; $0fb
-	db $0
-	dbw $2a, $5870 ; $0fc
-	db $0
-	dbw $2a, $587c ; $0fd
-	db $0
-	dbw $2a, $5890 ; $0fe
-	db $0
-	dbw $2a, $589c ; $0ff
-	db $0
-	dbw $2a, $58b0 ; $100
-	db $0
-	dbw $2a, $58bc ; $101
-	db $0
-	dbw $2a, $58d0 ; $102
-	db $0
-	dbw $0d, $7ff8 ; $103
-	db $0
-	dbw $0e, $7ff8 ; $104
-	db $0
-	dbw $12, $7ff8 ; $105
-	db $0
-	dbw $16, $7ff8 ; $106
-	db $0
-	dbw $18, $7ff8 ; $107
-	db $0
-	dbw $19, $7ff8 ; $108
-	db $0
-	dbw $1a, $7ff8 ; $109
-	db $0
-	dbw $24, $7ff8 ; $10a
-	db $0
-	dbw $2a, $58dc ; $10b
-	db $0
-	dbw $2a, $58e8 ; $10c
-	db $0
-	dbw $2a, $58f4 ; $10d
-	db $0
-	dbw $2a, $5900 ; $10e
-	db $0
-	dbw $2a, $5938 ; $10f
-	db $0
-	dbw $2a, $5940 ; $110
-	db $0
-	dbw $2a, $5948 ; $111
-	db $0
-	dbw $2a, $59a8 ; $112
-	db $0
-	dbw $2a, $59cc ; $113
-	db $0
-	dbw $2a, $5a58 ; $114
-	db $0
-	dbw $2a, $5ae4 ; $115
-	db $0
-	dbw $2a, $5aec ; $116
-	db $0
-	dbw $2a, $5af4 ; $117
-	db $0
-	dbw $2a, $5b00 ; $118
-	db $0
-	dbw $2a, $5b64 ; $119
-	db $0
-	dbw $2a, $5bc8 ; $11a
-	db $0
-	dbw $2a, $5c2c ; $11b
-	db $0
-	dbw $2a, $5c90 ; $11c
-	db $0
-	dbw $2a, $5c98 ; $11d
-	db $0
-	dbw $2a, $5ca0 ; $11e
-	db $0
-	dbw $2a, $5ca8 ; $11f
-	db $0
-	dbw $2a, $5cb0 ; $120
-	db $0
-	dbw $2a, $5cbc ; $121
-	db $0
-	dbw $2a, $5cc8 ; $122
-	db $0
-	dbw $2a, $5cd4 ; $123
-	db $0
-	dbw $2a, $5ce0 ; $124
-	db $0
-	dbw $2a, $5cec ; $125
-	db $0
-	dbw $2a, $5cf8 ; $126
-	db $0
-	dbw $2a, $5d04 ; $127
-	db $0
-	dbw $2a, $5d10 ; $128
-	db $0
-	dbw $2a, $5d1c ; $129
-	db $0
-	dbw $2a, $5d28 ; $12a
-	db $0
-	dbw $2a, $5d34 ; $12b
-	db $0
-	dbw $2a, $5d40 ; $12c
-	db $0
-	dbw $2a, $5d4c ; $12d
-	db $0
-	dbw $2a, $5d58 ; $12e
-	db $0
-	dbw $2a, $5d64 ; $12f
-	db $0
-	dbw $2a, $5d70 ; $130
-	db $0
-	dbw $2a, $5d7c ; $131
-	db $0
-	dbw $2a, $5d88 ; $132
-	db $0
-	dbw $2a, $5d94 ; $133
-	db $0
-	dbw $2a, $5da0 ; $134
-	db $0
-	dbw $2a, $5dac ; $135
-	db $0
-	dbw $2a, $5db8 ; $136
-	db $0
-	dbw $2a, $5dc4 ; $137
-	db $0
-	dbw $2a, $5dd0 ; $138
-	db $0
-	dbw $2a, $5ddc ; $139
-	db $0
-	dbw $2a, $5de8 ; $13a
-	db $0
-	dbw $2a, $5df4 ; $13b
-	db $0
-	dbw $2a, $5e00 ; $13c
-	db $0
-	dbw $2a, $5e0c ; $13d
-	db $0
-	dbw $2a, $5e18 ; $13e
-	db $0
-	dbw $2a, $5e24 ; $13f
-	db $0
-	dbw $2a, $5e30 ; $140
-	db $0
-	dbw $2a, $5e3c ; $141
-	db $0
-	dbw $2a, $5e48 ; $142
-	db $0
-	dbw $2a, $5e54 ; $143
-	db $0
-	dbw $2a, $5e60 ; $144
-	db $0
-	dbw $2a, $5e6c ; $145
-	db $0
-	dbw $2a, $5e78 ; $146
-	db $0
-	dbw $2a, $5e84 ; $147
-	db $0
-	dbw $2a, $5e94 ; $148
-	db $0
-	dbw $2a, $5ea0 ; $149
-	db $0
-	dbw $2a, $5eb0 ; $14a
-	db $0
-	dbw $2a, $5ec0 ; $14b
-	db $0
-	dbw $2a, $5ecc ; $14c
-	db $0
-	dbw $2a, $5ee0 ; $14d
-	db $0
-	dbw $2a, $5eec ; $14e
-	db $0
-	dbw $2a, $5ef8 ; $14f
-	db $0
-	dbw $2a, $5f04 ; $150
-	db $0
-	dbw $2a, $5f10 ; $151
-	db $0
-	dbw $2a, $5f1c ; $152
-	db $0
-	dbw $2a, $5f28 ; $153
-	db $0
-	dbw $2a, $5f3c ; $154
-	db $0
-	dbw $2a, $5f4c ; $155
-	db $0
-	dbw $2a, $5f58 ; $156
-	db $0
-	dbw $2a, $5f60 ; $157
-	db $0
-	dbw $2a, $5f6c ; $158
-	db $0
-	dbw $2a, $5f78 ; $159
-	db $0
-	dbw $2a, $5f84 ; $15a
-	db $0
-	dbw $2a, $5f90 ; $15b
-	db $0
-	dbw $2a, $5f9c ; $15c
-	db $0
-	dbw $2a, $5fa8 ; $15d
-	db $0
-	dbw $2a, $5fb4 ; $15e
-	db $0
-	dbw $2a, $5fc0 ; $15f
-	db $0
-	dbw $2a, $5fcc ; $160
-	db $0
-	dbw $2a, $5fd8 ; $161
-	db $0
-	dbw $2a, $5fe4 ; $162
-	db $0
-	dbw $2a, $5fec ; $163
-	db $0
-	dbw $2a, $6004 ; $164
-	db $0
-	dbw $2a, $6010 ; $165
-	db $0
-	dbw $2a, $6040 ; $166
-	db $0
-	dbw $2a, $604c ; $167
-	db $0
-	dbw $2a, $6058 ; $168
-	db $0
-	dbw $2a, $6064 ; $169
-	db $0
-	dbw $2a, $6070 ; $16a
-	db $0
-	dbw $2a, $6084 ; $16b
-	db $0
-	dbw $2a, $60a0 ; $16c
-	db $0
-	dbw $2a, $60ac ; $16d
-	db $0
-	dbw $2a, $60dc ; $16e
-	db $0
-	dbw $2a, $6158 ; $16f
-	db $0
-	dbw $2a, $61a8 ; $170
-	db $0
-	dbw $2a, $61b4 ; $171
-	db $0
-	dbw $2a, $61c0 ; $172
-	db $0
-	dbw $2a, $61d8 ; $173
-	db $0
-	dbw $2a, $61ec ; $174
-	db $0
-	dbw $2a, $6278 ; $175
-	db $0
-	dbw $2a, $6284 ; $176
-	db $0
-	dbw $2a, $6530 ; $177
-	db $0

src/data/gfx_pointers/sprite_animations.asm

@@ -1,349 +1,175 @@
 SpriteAnimations:
-	dbw $25, $5460 ; SPRITE_ANIM_00
-	db $0
-	dbw $25, $54e9 ; SPRITE_ANIM_01
-	db $0
-	dbw $25, $55af ; SPRITE_ANIM_02
-	db $0
-	dbw $25, $566a ; SPRITE_ANIM_03
-	db $0
-	dbw $25, $5782 ; SPRITE_ANIM_04
-	db $0
-	dbw $25, $585e ; SPRITE_ANIM_05
-	db $0
-	dbw $25, $59cb ; SPRITE_ANIM_06
-	db $0
-	dbw $25, $5a56 ; SPRITE_ANIM_07
-	db $0
-	dbw $25, $5b07 ; SPRITE_ANIM_08
-	db $0
-	dbw $25, $5c69 ; SPRITE_ANIM_09
-	db $0
-	dbw $25, $5d84 ; SPRITE_ANIM_0A
-	db $0
-	dbw $25, $5fce ; SPRITE_ANIM_0B
-	db $0
-	dbw $25, $62f2 ; SPRITE_ANIM_0C
-	db $0
-	dbw $25, $640a ; SPRITE_ANIM_0D
-	db $0
-	dbw $25, $6b96 ; SPRITE_ANIM_0E
-	db $0
-	dbw $25, $6d02 ; SPRITE_ANIM_0F
-	db $0
-	dbw $25, $6df5 ; SPRITE_ANIM_10
-	db $0
-	dbw $25, $6fb5 ; SPRITE_ANIM_11
-	db $0
-	dbw $25, $70bc ; SPRITE_ANIM_12
-	db $0
-	dbw $25, $75a7 ; SPRITE_ANIM_13
-	db $0
-	dbw $25, $77ca ; SPRITE_ANIM_14
-	db $0
-	dbw $25, $7914 ; SPRITE_ANIM_15
-	db $0
-	dbw $25, $7c3d ; SPRITE_ANIM_16
-	db $0
-	dbw $26, $4000 ; SPRITE_ANIM_17
-	db $0
-	dbw $26, $42b3 ; SPRITE_ANIM_18
-	db $0
-	dbw $26, $4452 ; SPRITE_ANIM_19
-	db $0
-	dbw $26, $45e6 ; SPRITE_ANIM_1A
-	db $0
-	dbw $26, $4886 ; SPRITE_ANIM_1B
-	db $0
-	dbw $26, $49fd ; SPRITE_ANIM_1C
-	db $0
-	dbw $26, $4ff2 ; SPRITE_ANIM_1D
-	db $0
-	dbw $25, $7eb4 ; SPRITE_ANIM_1E
-	db $0
-	dbw $26, $5178 ; SPRITE_ANIM_1F
-	db $0
-	dbw $26, $52c4 ; SPRITE_ANIM_20
-	db $0
-	dbw $26, $57ff ; SPRITE_ANIM_21
-	db $0
-	dbw $26, $5946 ; SPRITE_ANIM_22
-	db $0
-	dbw $26, $5dde ; SPRITE_ANIM_23
-	db $0
-	dbw $26, $5ec2 ; SPRITE_ANIM_24
-	db $0
-	dbw $26, $601f ; SPRITE_ANIM_25
-	db $0
-	dbw $26, $63be ; SPRITE_ANIM_26
-	db $0
-	dbw $26, $67a2 ; SPRITE_ANIM_27
-	db $0
-	dbw $26, $6a01 ; SPRITE_ANIM_28
-	db $0
-	dbw $26, $6b21 ; SPRITE_ANIM_29
-	db $0
-	dbw $26, $6c83 ; SPRITE_ANIM_2A
-	db $0
-	dbw $26, $6da3 ; SPRITE_ANIM_2B
-	db $0
-	dbw $26, $6ebb ; SPRITE_ANIM_2C
-	db $0
-	dbw $26, $7128 ; SPRITE_ANIM_2D
-	db $0
-	dbw $26, $73c1 ; SPRITE_ANIM_2E
-	db $0
-	dbw $26, $7871 ; SPRITE_ANIM_2F
-	db $0
-	dbw $26, $7b2c ; SPRITE_ANIM_30
-	db $0
-	dbw $26, $7bca ; SPRITE_ANIM_31
-	db $0
-	dbw $26, $7c3b ; SPRITE_ANIM_32
-	db $0
-	dbw $27, $4000 ; SPRITE_ANIM_33
-	db $0
-	dbw $26, $7d94 ; SPRITE_ANIM_34
-	db $0
-	dbw $27, $4292 ; SPRITE_ANIM_35
-	db $0
-	dbw $27, $4411 ; SPRITE_ANIM_36
-	db $0
-	dbw $26, $7f6c ; SPRITE_ANIM_37
-	db $0
-	dbw $27, $44b4 ; SPRITE_ANIM_38
-	db $0
-	dbw $27, $4765 ; SPRITE_ANIM_39
-	db $0
-	dbw $27, $4803 ; SPRITE_ANIM_3A
-	db $0
-	dbw $27, $4b4d ; SPRITE_ANIM_3B
-	db $0
-	dbw $27, $5171 ; SPRITE_ANIM_3C
-	db $0
-	dbw $27, $5529 ; SPRITE_ANIM_3D
-	db $0
-	dbw $27, $592a ; SPRITE_ANIM_3E
-	db $0
-	dbw $27, $5c57 ; SPRITE_ANIM_3F
-	db $0
-	dbw $27, $6294 ; SPRITE_ANIM_40
-	db $0
-	dbw $27, $664d ; SPRITE_ANIM_41
-	db $0
-	dbw $27, $67ed ; SPRITE_ANIM_42
-	db $0
-	dbw $27, $69a1 ; SPRITE_ANIM_43
-	db $0
-	dbw $27, $6e77 ; SPRITE_ANIM_44
-	db $0
-	dbw $27, $7051 ; SPRITE_ANIM_45
-	db $0
-	dbw $27, $7217 ; SPRITE_ANIM_46
-	db $0
-	dbw $27, $749c ; SPRITE_ANIM_47
-	db $0
-	dbw $27, $76a7 ; SPRITE_ANIM_48
-	db $0
-	dbw $27, $7799 ; SPRITE_ANIM_49
-	db $0
-	dbw $27, $7a39 ; SPRITE_ANIM_4A
-	db $0
-	dbw $28, $4000 ; SPRITE_ANIM_4B
-	db $0
-	dbw $27, $7c51 ; SPRITE_ANIM_4C
-	db $0
-	dbw $28, $4cdb ; SPRITE_ANIM_4D
-	db $0
-	dbw $27, $7e39 ; SPRITE_ANIM_4E
-	db $0
-	dbw $28, $4fab ; SPRITE_ANIM_4F
-	db $0
-	dbw $28, $5117 ; SPRITE_ANIM_50
-	db $0
-	dbw $28, $53b9 ; SPRITE_ANIM_51
-	db $0
-	dbw $28, $5492 ; SPRITE_ANIM_52
-	db $0
-	dbw $28, $55bb ; SPRITE_ANIM_53
-	db $0
-	dbw $28, $587d ; SPRITE_ANIM_54
-	db $0
-	dbw $28, $5b39 ; SPRITE_ANIM_55
-	db $0
-	dbw $28, $5e92 ; SPRITE_ANIM_56
-	db $0
-	dbw $28, $61a5 ; SPRITE_ANIM_57
-	db $0
-	dbw $28, $63ae ; SPRITE_ANIM_58
-	db $0
-	dbw $27, $7f85 ; SPRITE_ANIM_59
-	db $0
-	dbw $28, $6772 ; SPRITE_ANIM_5A
-	db $0
-	dbw $28, $6804 ; SPRITE_ANIM_5B
-	db $0
-	dbw $28, $691c ; SPRITE_ANIM_5C
-	db $0
-	dbw $28, $6efd ; SPRITE_ANIM_5D
-	db $0
-	dbw $28, $6fc6 ; SPRITE_ANIM_5E
-	db $0
-	dbw $28, $719f ; SPRITE_ANIM_5F
-	db $0
-	dbw $28, $725d ; SPRITE_ANIM_60
-	db $0
-	dbw $28, $731b ; SPRITE_ANIM_61
-	db $0
-	dbw $28, $73d9 ; SPRITE_ANIM_62
-	db $0
-	dbw $28, $7497 ; SPRITE_ANIM_63
-	db $0
-	dbw $28, $7555 ; SPRITE_ANIM_64
-	db $0
-	dbw $28, $7613 ; SPRITE_ANIM_65
-	db $0
-	dbw $28, $76d1 ; SPRITE_ANIM_66
-	db $0
-	dbw $28, $778f ; SPRITE_ANIM_67
-	db $0
-	dbw $28, $784d ; SPRITE_ANIM_68
-	db $0
-	dbw $28, $790b ; SPRITE_ANIM_69
-	db $0
-	dbw $28, $79c9 ; SPRITE_ANIM_6A
-	db $0
-	dbw $25, $7fb4 ; SPRITE_ANIM_6B
-	db $0
-	dbw $28, $7a87 ; SPRITE_ANIM_6C
-	db $0
-	dbw $28, $7b45 ; SPRITE_ANIM_6D
-	db $0
-	dbw $28, $7c03 ; SPRITE_ANIM_6E
-	db $0
-	dbw $28, $7cc1 ; SPRITE_ANIM_6F
-	db $0
-	dbw $28, $7d7f ; SPRITE_ANIM_70
-	db $0
-	dbw $28, $7e3d ; SPRITE_ANIM_71
-	db $0
-	dbw $28, $7efb ; SPRITE_ANIM_72
-	db $0
-	dbw $29, $4000 ; SPRITE_ANIM_73
-	db $0
-	dbw $29, $40be ; SPRITE_ANIM_74
-	db $0
-	dbw $29, $417c ; SPRITE_ANIM_75
-	db $0
-	dbw $29, $423a ; SPRITE_ANIM_76
-	db $0
-	dbw $29, $42f8 ; SPRITE_ANIM_77
-	db $0
-	dbw $29, $43b6 ; SPRITE_ANIM_78
-	db $0
-	dbw $29, $4474 ; SPRITE_ANIM_79
-	db $0
-	dbw $29, $4532 ; SPRITE_ANIM_7A
-	db $0
-	dbw $29, $45f0 ; SPRITE_ANIM_7B
-	db $0
-	dbw $29, $46ae ; SPRITE_ANIM_7C
-	db $0
-	dbw $29, $476c ; SPRITE_ANIM_7D
-	db $0
-	dbw $29, $47b8 ; SPRITE_ANIM_7E
-	db $0
-	dbw $26, $7fde ; SPRITE_ANIM_7F
-	db $0
-	dbw $28, $7fb9 ; SPRITE_ANIM_80
-	db $0
-	dbw $28, $7fcc ; SPRITE_ANIM_81
-	db $0
-	dbw $29, $4804 ; SPRITE_ANIM_82
-	db $0
-	dbw $29, $4876 ; SPRITE_ANIM_83
-	db $0
-	dbw $29, $48ac ; SPRITE_ANIM_84
-	db $0
-	dbw $29, $49d4 ; SPRITE_ANIM_85
-	db $0
-	dbw $29, $4b39 ; SPRITE_ANIM_86
-	db $0
-	dbw $29, $4b84 ; SPRITE_ANIM_87
-	db $0
-	dbw $28, $7fdf ; SPRITE_ANIM_88
-	db $0
-	dbw $29, $4bbd ; SPRITE_ANIM_89
-	db $0
-	dbw $29, $4bd7 ; SPRITE_ANIM_8A
-	db $0
-	dbw $29, $4bf8 ; SPRITE_ANIM_8B
-	db $0
-	dbw $26, $7ff1 ; SPRITE_ANIM_8C
-	db $0
-	dbw $29, $4c16 ; SPRITE_ANIM_8D
-	db $0
-	dbw $29, $4c4c ; SPRITE_ANIM_8E
-	db $0
-	dbw $29, $4c95 ; SPRITE_ANIM_8F
-	db $0
-	dbw $29, $4cce ; SPRITE_ANIM_90
-	db $0
-	dbw $29, $4d04 ; SPRITE_ANIM_91
-	db $0
-	dbw $29, $4d63 ; SPRITE_ANIM_92
-	db $0
-	dbw $29, $4d76 ; SPRITE_ANIM_93
-	db $0
-	dbw $29, $4d89 ; SPRITE_ANIM_94
-	db $0
-	dbw $29, $4d9c ; SPRITE_ANIM_95
-	db $0
-	dbw $29, $4daf ; SPRITE_ANIM_96
-	db $0
-	dbw $29, $4dc2 ; SPRITE_ANIM_97
-	db $0
-	dbw $29, $4dd5 ; SPRITE_ANIM_98
-	db $0
-	dbw $29, $4de8 ; SPRITE_ANIM_99
-	db $0
-	dbw $29, $4dfb ; SPRITE_ANIM_9A
-	db $0
-	dbw $29, $4e4e ; SPRITE_ANIM_9B
-	db $0
-	dbw $29, $4ebd ; SPRITE_ANIM_9C
-	db $0
-	dbw $29, $4fef ; SPRITE_ANIM_9D
-	db $0
-	dbw $29, $5032 ; SPRITE_ANIM_9E
-	db $0
-	dbw $29, $5048 ; SPRITE_ANIM_9F
-	db $0
-	dbw $29, $50c3 ; SPRITE_ANIM_A0
-	db $0
-	dbw $29, $5166 ; SPRITE_ANIM_A1
-	db $0
-	dbw $29, $51f9 ; SPRITE_ANIM_A2
-	db $0
-	dbw $29, $5325 ; SPRITE_ANIM_A3
-	db $0
-	dbw $29, $53f8 ; SPRITE_ANIM_A4
-	db $0
-	dbw $29, $543b ; SPRITE_ANIM_A5
-	db $0
-	dbw $29, $5704 ; SPRITE_ANIM_A6
-	db $0
-	dbw $29, $5929 ; SPRITE_ANIM_A7
-	db $0
-	dbw $29, $5eea ; SPRITE_ANIM_A8
-	db $0
-	dbw $29, $5f11 ; SPRITE_ANIM_A9
-	db $0
-	dbw $29, $5f89 ; SPRITE_ANIM_AA
-	db $0
-	dbw $29, $5f9f ; SPRITE_ANIM_AB
-	db $0
-	dbw $29, $625b ; SPRITE_ANIM_AC
-	db $0
-	dbw $29, $62cf ; SPRITE_ANIM_AD
-	db $0
+	gfx_ptr OAMData00 ; SPRITE_ANIM_00
+	gfx_ptr OAMData01 ; SPRITE_ANIM_01
+	gfx_ptr OAMData02 ; SPRITE_ANIM_02
+	gfx_ptr OAMData03 ; SPRITE_ANIM_03
+	gfx_ptr OAMData04 ; SPRITE_ANIM_04
+	gfx_ptr OAMData05 ; SPRITE_ANIM_05
+	gfx_ptr OAMData06 ; SPRITE_ANIM_06
+	gfx_ptr OAMData07 ; SPRITE_ANIM_07
+	gfx_ptr OAMData08 ; SPRITE_ANIM_08
+	gfx_ptr OAMData09 ; SPRITE_ANIM_09
+	gfx_ptr OAMData0A ; SPRITE_ANIM_0A
+	gfx_ptr OAMData0B ; SPRITE_ANIM_0B
+	gfx_ptr OAMData0C ; SPRITE_ANIM_0C
+	gfx_ptr OAMData0D ; SPRITE_ANIM_0D
+	gfx_ptr OAMData0E ; SPRITE_ANIM_0E
+	gfx_ptr OAMData0F ; SPRITE_ANIM_0F
+	gfx_ptr OAMData10 ; SPRITE_ANIM_10
+	gfx_ptr OAMData11 ; SPRITE_ANIM_11
+	gfx_ptr OAMData12 ; SPRITE_ANIM_12
+	gfx_ptr OAMData13 ; SPRITE_ANIM_13
+	gfx_ptr OAMData14 ; SPRITE_ANIM_14
+	gfx_ptr OAMData15 ; SPRITE_ANIM_15
+	gfx_ptr OAMData16 ; SPRITE_ANIM_16
+	gfx_ptr OAMData17 ; SPRITE_ANIM_17
+	gfx_ptr OAMData18 ; SPRITE_ANIM_18
+	gfx_ptr OAMData19 ; SPRITE_ANIM_19
+	gfx_ptr OAMData1A ; SPRITE_ANIM_1A
+	gfx_ptr OAMData1B ; SPRITE_ANIM_1B
+	gfx_ptr OAMData1C ; SPRITE_ANIM_1C
+	gfx_ptr OAMData1D ; SPRITE_ANIM_1D
+	gfx_ptr OAMData1E ; SPRITE_ANIM_1E
+	gfx_ptr OAMData1F ; SPRITE_ANIM_1F
+	gfx_ptr OAMData20 ; SPRITE_ANIM_20
+	gfx_ptr OAMData21 ; SPRITE_ANIM_21
+	gfx_ptr OAMData22 ; SPRITE_ANIM_22
+	gfx_ptr OAMData23 ; SPRITE_ANIM_23
+	gfx_ptr OAMData24 ; SPRITE_ANIM_24
+	gfx_ptr OAMData25 ; SPRITE_ANIM_25
+	gfx_ptr OAMData26 ; SPRITE_ANIM_26
+	gfx_ptr OAMData27 ; SPRITE_ANIM_27
+	gfx_ptr OAMData28 ; SPRITE_ANIM_28
+	gfx_ptr OAMData29 ; SPRITE_ANIM_29
+	gfx_ptr OAMData2A ; SPRITE_ANIM_2A
+	gfx_ptr OAMData2B ; SPRITE_ANIM_2B
+	gfx_ptr OAMData2C ; SPRITE_ANIM_2C
+	gfx_ptr OAMData2D ; SPRITE_ANIM_2D
+	gfx_ptr OAMData2E ; SPRITE_ANIM_2E
+	gfx_ptr OAMData2F ; SPRITE_ANIM_2F
+	gfx_ptr OAMData30 ; SPRITE_ANIM_30
+	gfx_ptr OAMData31 ; SPRITE_ANIM_31
+	gfx_ptr OAMData32 ; SPRITE_ANIM_32
+	gfx_ptr OAMData33 ; SPRITE_ANIM_33
+	gfx_ptr OAMData34 ; SPRITE_ANIM_34
+	gfx_ptr OAMData35 ; SPRITE_ANIM_35
+	gfx_ptr OAMData36 ; SPRITE_ANIM_36
+	gfx_ptr OAMData37 ; SPRITE_ANIM_37
+	gfx_ptr OAMData38 ; SPRITE_ANIM_38
+	gfx_ptr OAMData39 ; SPRITE_ANIM_39
+	gfx_ptr OAMData3A ; SPRITE_ANIM_3A
+	gfx_ptr OAMData3B ; SPRITE_ANIM_3B
+	gfx_ptr OAMData3C ; SPRITE_ANIM_3C
+	gfx_ptr OAMData3D ; SPRITE_ANIM_3D
+	gfx_ptr OAMData3E ; SPRITE_ANIM_3E
+	gfx_ptr OAMData3F ; SPRITE_ANIM_3F
+	gfx_ptr OAMData40 ; SPRITE_ANIM_40
+	gfx_ptr OAMData41 ; SPRITE_ANIM_41
+	gfx_ptr OAMData42 ; SPRITE_ANIM_42
+	gfx_ptr OAMData43 ; SPRITE_ANIM_43
+	gfx_ptr OAMData44 ; SPRITE_ANIM_44
+	gfx_ptr OAMData45 ; SPRITE_ANIM_45
+	gfx_ptr OAMData46 ; SPRITE_ANIM_46
+	gfx_ptr OAMData47 ; SPRITE_ANIM_47
+	gfx_ptr OAMData48 ; SPRITE_ANIM_48
+	gfx_ptr OAMData49 ; SPRITE_ANIM_49
+	gfx_ptr OAMData4A ; SPRITE_ANIM_4A
+	gfx_ptr OAMData4B ; SPRITE_ANIM_4B
+	gfx_ptr OAMData4C ; SPRITE_ANIM_4C
+	gfx_ptr OAMData4D ; SPRITE_ANIM_4D
+	gfx_ptr OAMData4E ; SPRITE_ANIM_4E
+	gfx_ptr OAMData4F ; SPRITE_ANIM_4F
+	gfx_ptr OAMData50 ; SPRITE_ANIM_50
+	gfx_ptr OAMData51 ; SPRITE_ANIM_51
+	gfx_ptr OAMData52 ; SPRITE_ANIM_52
+	gfx_ptr OAMData53 ; SPRITE_ANIM_53
+	gfx_ptr OAMData54 ; SPRITE_ANIM_54
+	gfx_ptr OAMData55 ; SPRITE_ANIM_55
+	gfx_ptr OAMData56 ; SPRITE_ANIM_56
+	gfx_ptr OAMData57 ; SPRITE_ANIM_57
+	gfx_ptr OAMData58 ; SPRITE_ANIM_58
+	gfx_ptr OAMData59 ; SPRITE_ANIM_59
+	gfx_ptr OAMData5A ; SPRITE_ANIM_5A
+	gfx_ptr OAMData5B ; SPRITE_ANIM_5B
+	gfx_ptr OAMData5C ; SPRITE_ANIM_5C
+	gfx_ptr OAMData5D ; SPRITE_ANIM_5D
+	gfx_ptr OAMData5E ; SPRITE_ANIM_5E
+	gfx_ptr OAMData5F ; SPRITE_ANIM_5F
+	gfx_ptr OAMData60 ; SPRITE_ANIM_60
+	gfx_ptr OAMData61 ; SPRITE_ANIM_61
+	gfx_ptr OAMData62 ; SPRITE_ANIM_62
+	gfx_ptr OAMData63 ; SPRITE_ANIM_63
+	gfx_ptr OAMData64 ; SPRITE_ANIM_64
+	gfx_ptr OAMData65 ; SPRITE_ANIM_65
+	gfx_ptr OAMData66 ; SPRITE_ANIM_66
+	gfx_ptr OAMData67 ; SPRITE_ANIM_67
+	gfx_ptr OAMData68 ; SPRITE_ANIM_68
+	gfx_ptr OAMData69 ; SPRITE_ANIM_69
+	gfx_ptr OAMData6A ; SPRITE_ANIM_6A
+	gfx_ptr OAMData6B ; SPRITE_ANIM_6B
+	gfx_ptr OAMData6C ; SPRITE_ANIM_6C
+	gfx_ptr OAMData6D ; SPRITE_ANIM_6D
+	gfx_ptr OAMData6E ; SPRITE_ANIM_6E
+	gfx_ptr OAMData6F ; SPRITE_ANIM_6F
+	gfx_ptr OAMData70 ; SPRITE_ANIM_70
+	gfx_ptr OAMData71 ; SPRITE_ANIM_71
+	gfx_ptr OAMData72 ; SPRITE_ANIM_72
+	gfx_ptr OAMData73 ; SPRITE_ANIM_73
+	gfx_ptr OAMData74 ; SPRITE_ANIM_74
+	gfx_ptr OAMData75 ; SPRITE_ANIM_75
+	gfx_ptr OAMData76 ; SPRITE_ANIM_76
+	gfx_ptr OAMData77 ; SPRITE_ANIM_77
+	gfx_ptr OAMData78 ; SPRITE_ANIM_78
+	gfx_ptr OAMData79 ; SPRITE_ANIM_79
+	gfx_ptr OAMData7A ; SPRITE_ANIM_7A
+	gfx_ptr OAMData7B ; SPRITE_ANIM_7B
+	gfx_ptr OAMData7C ; SPRITE_ANIM_7C
+	gfx_ptr OAMData7D ; SPRITE_ANIM_7D
+	gfx_ptr OAMData7E ; SPRITE_ANIM_7E
+	gfx_ptr OAMData7F ; SPRITE_ANIM_7F
+	gfx_ptr OAMData80 ; SPRITE_ANIM_80
+	gfx_ptr OAMData81 ; SPRITE_ANIM_81
+	gfx_ptr OAMData82 ; SPRITE_ANIM_82
+	gfx_ptr OAMData83 ; SPRITE_ANIM_83
+	gfx_ptr OAMData84 ; SPRITE_ANIM_84
+	gfx_ptr OAMData85 ; SPRITE_ANIM_85
+	gfx_ptr OAMData86 ; SPRITE_ANIM_86
+	gfx_ptr OAMData87 ; SPRITE_ANIM_87
+	gfx_ptr OAMData88 ; SPRITE_ANIM_88
+	gfx_ptr OAMData89 ; SPRITE_ANIM_89
+	gfx_ptr OAMData8A ; SPRITE_ANIM_8A
+	gfx_ptr OAMData8B ; SPRITE_ANIM_8B
+	gfx_ptr OAMData8C ; SPRITE_ANIM_8C
+	gfx_ptr OAMData8D ; SPRITE_ANIM_8D
+	gfx_ptr OAMData8E ; SPRITE_ANIM_8E
+	gfx_ptr OAMData8F ; SPRITE_ANIM_8F
+	gfx_ptr OAMData90 ; SPRITE_ANIM_90
+	gfx_ptr OAMData91 ; SPRITE_ANIM_91
+	gfx_ptr OAMData92 ; SPRITE_ANIM_92
+	gfx_ptr OAMData93 ; SPRITE_ANIM_93
+	gfx_ptr OAMData94 ; SPRITE_ANIM_94
+	gfx_ptr OAMData95 ; SPRITE_ANIM_95
+	gfx_ptr OAMData96 ; SPRITE_ANIM_96
+	gfx_ptr OAMData97 ; SPRITE_ANIM_97
+	gfx_ptr OAMData98 ; SPRITE_ANIM_98
+	gfx_ptr OAMData99 ; SPRITE_ANIM_99
+	gfx_ptr OAMData9A ; SPRITE_ANIM_9A
+	gfx_ptr OAMData9B ; SPRITE_ANIM_9B
+	gfx_ptr OAMData9C ; SPRITE_ANIM_9C
+	gfx_ptr OAMData9D ; SPRITE_ANIM_9D
+	gfx_ptr OAMData9E ; SPRITE_ANIM_9E
+	gfx_ptr OAMData9F ; SPRITE_ANIM_9F
+	gfx_ptr OAMDataA0 ; SPRITE_ANIM_A0
+	gfx_ptr OAMDataA1 ; SPRITE_ANIM_A1
+	gfx_ptr OAMDataA2 ; SPRITE_ANIM_A2
+	gfx_ptr OAMDataA3 ; SPRITE_ANIM_A3
+	gfx_ptr OAMDataA4 ; SPRITE_ANIM_A4
+	gfx_ptr OAMDataA5 ; SPRITE_ANIM_A5
+	gfx_ptr OAMDataA6 ; SPRITE_ANIM_A6
+	gfx_ptr OAMDataA7 ; SPRITE_ANIM_A7
+	gfx_ptr OAMDataA8 ; SPRITE_ANIM_A8
+	gfx_ptr OAMDataA9 ; SPRITE_ANIM_A9
+	gfx_ptr OAMDataAA ; SPRITE_ANIM_AA
+	gfx_ptr OAMDataAB ; SPRITE_ANIM_AB
+	gfx_ptr OAMDataAC ; SPRITE_ANIM_AC
+	gfx_ptr OAMDataAD ; SPRITE_ANIM_AD

src/data/gfx_pointers/tilesets.asm

@@ -455,12 +455,12 @@ Tilesets:
 	gfx_ptr Tileset1C5 ; TILESET_1C5
 	gfx_ptr Tileset1C6 ; TILESET_1C6
 	gfx_ptr Tileset1C7 ; TILESET_1C7
-	gfx_ptr Tileset1C8 ; TILESET_1C8
-	gfx_ptr Tileset1C9 ; TILESET_1C9
-	gfx_ptr Tileset1CA ; TILESET_1CA
-	gfx_ptr Tileset1CB ; TILESET_1CB
+	gfx_ptr IntroBaseSetGfx ; TILESET_INTRO_BASE_SET
+	gfx_ptr IntroJungleGfx ; TILESET_INTRO_JUNGLE
+	gfx_ptr IntroFossilGfx ; TILESET_INTRO_FOSSIL
+	gfx_ptr IntroTeamRocketGfx ; TILESET_INTRO_TEAM_ROCKET
 	gfx_ptr Tileset1CC ; TILESET_1CC
-	gfx_ptr Tileset1CD ; TILESET_1CD
+	gfx_ptr TitleScreenGfx ; TILESET_TITLE_SCREEN
 	gfx_ptr Tileset1CE ; TILESET_1CE
 	gfx_ptr Tileset1CF ; TILESET_1CF
 	gfx_ptr Tileset1D0 ; TILESET_1D0

src/data/maps/tilemaps1.asm

@@ -1,62 +1,62 @@
-Tilemap000:
+Tilemap000::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions000
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap000.bin"
-Permissions000:
+Permissions000::
 	INCBIN "data/maps/permissions/permissions000.bin"
 
-Tilemap001:
+Tilemap001::
 	db 13 ; width
 	db 3 ; height
 	dw Permissions001
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap001.bin"
-Permissions001:
+Permissions001::
 	INCBIN "data/maps/permissions/permissions001.bin"
 
-Tilemap002:
+Tilemap002::
 	db 13 ; width
 	db 3 ; height
 	dw Permissions002
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap002.bin"
-Permissions002:
+Permissions002::
 	INCBIN "data/maps/permissions/permissions002.bin"
 
-Tilemap004:
+Tilemap004::
 	db 13 ; width
 	db 3 ; height
 	dw Permissions004
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap004.bin"
-Permissions004:
+Permissions004::
 	INCBIN "data/maps/permissions/permissions004.bin"
 
-Tilemap005:
+Tilemap005::
 	db 28 ; width
 	db 30 ; height
 	dw Permissions005
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap005.bin"
-Permissions005:
+Permissions005::
 	INCBIN "data/maps/permissions/permissions005.bin"
 
-Tilemap00C:
+Tilemap00C::
 	db 16 ; width
 	db 3 ; height
 	dw Permissions00C
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap00C.bin"
-Permissions00C:
+Permissions00C::
 	INCBIN "data/maps/permissions/permissions00C.bin"
 
-Tilemap01A:
+Tilemap01A::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions01A
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap01A.bin"
-Permissions01A:
+Permissions01A::
 	INCBIN "data/maps/permissions/permissions01A.bin"

src/data/maps/tilemaps2.asm

@@ -1,368 +1,368 @@
-Tilemap003:
+Tilemap003::
 	db 26 ; width
 	db 30 ; height
 	dw Permissions003
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap003.bin"
-Permissions003:
+Permissions003::
 	INCBIN "data/maps/permissions/permissions003.bin"
 
-Tilemap006:
+Tilemap006::
 	db 8 ; width
 	db 8 ; height
 	dw Permissions006
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap006.bin"
-Permissions006:
+Permissions006::
 	INCBIN "data/maps/permissions/permissions006.bin"
 
-Tilemap007:
+Tilemap007::
 	db 24 ; width
 	db 30 ; height
 	dw Permissions007
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap007.bin"
-Permissions007:
+Permissions007::
 	INCBIN "data/maps/permissions/permissions007.bin"
 
-Tilemap008:
+Tilemap008::
 	db 8 ; width
 	db 8 ; height
 	dw Permissions008
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap008.bin"
-Permissions008:
+Permissions008::
 	INCBIN "data/maps/permissions/permissions008.bin"
 
-Tilemap009:
+Tilemap009::
 	db 28 ; width
 	db 32 ; height
 	dw Permissions009
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap009.bin"
-Permissions009:
+Permissions009::
 	INCBIN "data/maps/permissions/permissions009.bin"
 
-Tilemap00A:
+Tilemap00A::
 	db 20 ; width
 	db 26 ; height
 	dw Permissions00A
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap00A.bin"
-Permissions00A:
+Permissions00A::
 	INCBIN "data/maps/permissions/permissions00A.bin"
 
-Tilemap00B:
+Tilemap00B::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions00B
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap00B.bin"
-Permissions00B:
+Permissions00B::
 	INCBIN "data/maps/permissions/permissions00B.bin"
 
-Tilemap00D:
+Tilemap00D::
 	db 32 ; width
 	db 30 ; height
 	dw Permissions00D
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap00D.bin"
-Permissions00D:
+Permissions00D::
 	INCBIN "data/maps/permissions/permissions00D.bin"
 
-Tilemap00E:
+Tilemap00E::
 	db 28 ; width
 	db 32 ; height
 	dw Permissions00E
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap00E.bin"
-Permissions00E:
+Permissions00E::
 	INCBIN "data/maps/permissions/permissions00E.bin"
 
-Tilemap00F:
+Tilemap00F::
 	db 28 ; width
 	db 32 ; height
 	dw Permissions00F
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap00F.bin"
-Permissions00F:
+Permissions00F::
 	INCBIN "data/maps/permissions/permissions00F.bin"
 
-Tilemap010:
+Tilemap010::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions010
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap010.bin"
-Permissions010:
+Permissions010::
 	INCBIN "data/maps/permissions/permissions010.bin"
 
-Tilemap011:
+Tilemap011::
 	db 32 ; width
 	db 30 ; height
 	dw Permissions011
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap011.bin"
-Permissions011:
+Permissions011::
 	INCBIN "data/maps/permissions/permissions011.bin"
 
-Tilemap012:
+Tilemap012::
 	db 28 ; width
 	db 28 ; height
 	dw Permissions012
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap012.bin"
-Permissions012:
+Permissions012::
 	INCBIN "data/maps/permissions/permissions012.bin"
 
-Tilemap013:
+Tilemap013::
 	db 7 ; width
 	db 4 ; height
 	dw Permissions013
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap013.bin"
-Permissions013:
+Permissions013::
 	INCBIN "data/maps/permissions/permissions013.bin"
 
-Tilemap014:
+Tilemap014::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions014
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap014.bin"
-Permissions014:
+Permissions014::
 	INCBIN "data/maps/permissions/permissions014.bin"
 
-Tilemap015:
+Tilemap015::
 	db 32 ; width
 	db 30 ; height
 	dw Permissions015
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap015.bin"
-Permissions015:
+Permissions015::
 	INCBIN "data/maps/permissions/permissions015.bin"
 
-Tilemap016:
+Tilemap016::
 	db 28 ; width
 	db 30 ; height
 	dw Permissions016
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap016.bin"
-Permissions016:
+Permissions016::
 	INCBIN "data/maps/permissions/permissions016.bin"
 
-Tilemap017:
+Tilemap017::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions017
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap017.bin"
-Permissions017:
+Permissions017::
 	INCBIN "data/maps/permissions/permissions017.bin"
 
-Tilemap018:
+Tilemap018::
 	db 32 ; width
 	db 30 ; height
 	dw Permissions018
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap018.bin"
-Permissions018:
+Permissions018::
 	INCBIN "data/maps/permissions/permissions018.bin"
 
-Tilemap019:
+Tilemap019::
 	db 24 ; width
 	db 24 ; height
 	dw Permissions019
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap019.bin"
-Permissions019:
+Permissions019::
 	INCBIN "data/maps/permissions/permissions019.bin"
 
-Tilemap01B:
+Tilemap01B::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions01B
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap01B.bin"
-Permissions01B:
+Permissions01B::
 	INCBIN "data/maps/permissions/permissions01B.bin"
 
-Tilemap01C:
+Tilemap01C::
 	db 32 ; width
 	db 30 ; height
 	dw Permissions01C
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap01C.bin"
-Permissions01C:
+Permissions01C::
 	INCBIN "data/maps/permissions/permissions01C.bin"
 
-Tilemap01D:
+Tilemap01D::
 	db 28 ; width
 	db 30 ; height
 	dw Permissions01D
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap01D.bin"
-Permissions01D:
+Permissions01D::
 	INCBIN "data/maps/permissions/permissions01D.bin"
 
-Tilemap01E:
+Tilemap01E::
 	db 8 ; width
 	db 4 ; height
 	dw Permissions01E
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap01E.bin"
-Permissions01E:
+Permissions01E::
 	INCBIN "data/maps/permissions/permissions01E.bin"
 
-Tilemap01F:
+Tilemap01F::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions01F
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap01F.bin"
-Permissions01F:
+Permissions01F::
 	INCBIN "data/maps/permissions/permissions01F.bin"
 
-Tilemap020:
+Tilemap020::
 	db 32 ; width
 	db 30 ; height
 	dw Permissions020
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap020.bin"
-Permissions020:
+Permissions020::
 	INCBIN "data/maps/permissions/permissions020.bin"
 
-Tilemap021:
+Tilemap021::
 	db 28 ; width
 	db 32 ; height
 	dw Permissions021
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap021.bin"
-Permissions021:
+Permissions021::
 	INCBIN "data/maps/permissions/permissions021.bin"
 
-Tilemap022:
+Tilemap022::
 	db 8 ; width
 	db 2 ; height
 	dw Permissions022
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap022.bin"
-Permissions022:
+Permissions022::
 	INCBIN "data/maps/permissions/permissions022.bin"
 
-Tilemap023:
+Tilemap023::
 	db 8 ; width
 	db 2 ; height
 	dw Permissions023
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap023.bin"
-Permissions023:
+Permissions023::
 	INCBIN "data/maps/permissions/permissions023.bin"
 
-Tilemap024:
+Tilemap024::
 	db 4 ; width
 	db 4 ; height
 	dw Permissions024
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap024.bin"
-Permissions024:
+Permissions024::
 	INCBIN "data/maps/permissions/permissions024.bin"
 
-Tilemap025:
+Tilemap025::
 	db 7 ; width
 	db 3 ; height
 	dw Permissions025
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap025.bin"
-Permissions025:
+Permissions025::
 	INCBIN "data/maps/permissions/permissions025.bin"
 
-Tilemap026:
+Tilemap026::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions026
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap026.bin"
-Permissions026:
+Permissions026::
 	INCBIN "data/maps/permissions/permissions026.bin"
 
-Tilemap027:
+Tilemap027::
 	db 32 ; width
 	db 30 ; height
 	dw Permissions027
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap027.bin"
-Permissions027:
+Permissions027::
 	INCBIN "data/maps/permissions/permissions027.bin"
 
-Tilemap028:
+Tilemap028::
 	db 28 ; width
 	db 32 ; height
 	dw Permissions028
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap028.bin"
-Permissions028:
+Permissions028::
 	INCBIN "data/maps/permissions/permissions028.bin"
 
-Tilemap029:
+Tilemap029::
 	db 8 ; width
 	db 4 ; height
 	dw Permissions029
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap029.bin"
-Permissions029:
+Permissions029::
 	INCBIN "data/maps/permissions/permissions029.bin"
 
-Tilemap02A:
+Tilemap02A::
 	db 10 ; width
 	db 9 ; height
 	dw Permissions02A
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap02A.bin"
-Permissions02A:
+Permissions02A::
 	INCBIN "data/maps/permissions/permissions02A.bin"
 
-Tilemap02B:
+Tilemap02B::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions02B
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap02B.bin"
-Permissions02B:
+Permissions02B::
 	INCBIN "data/maps/permissions/permissions02B.bin"
 
-Tilemap02E:
+Tilemap02E::
 	db 8 ; width
 	db 6 ; height
 	dw Permissions02E
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap02E.bin"
-Permissions02E:
+Permissions02E::
 	INCBIN "data/maps/permissions/permissions02E.bin"
 
-Tilemap02F:
+Tilemap02F::
 	db 8 ; width
 	db 4 ; height
 	dw Permissions02F
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap02F.bin"
-Permissions02F:
+Permissions02F::
 	INCBIN "data/maps/permissions/permissions02F.bin"
 
-Tilemap037:
+Tilemap037::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions037
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap037.bin"
-Permissions037:
+Permissions037::
 	INCBIN "data/maps/permissions/permissions037.bin"
 
-Tilemap038:
+Tilemap038::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions038
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap038.bin"
-Permissions038:
+Permissions038::
 	INCBIN "data/maps/permissions/permissions038.bin"

src/data/maps/tilemaps3.asm

@@ -1,521 +1,521 @@
-Tilemap02C:
+Tilemap02C::
 	db 32 ; width
 	db 30 ; height
 	dw Permissions02C
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap02C.bin"
-Permissions02C:
+Permissions02C::
 	INCBIN "data/maps/permissions/permissions02C.bin"
 
-Tilemap02D:
+Tilemap02D::
 	db 28 ; width
 	db 32 ; height
 	dw Permissions02D
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap02D.bin"
-Permissions02D:
+Permissions02D::
 	INCBIN "data/maps/permissions/permissions02D.bin"
 
-Tilemap030:
+Tilemap030::
 	db 24 ; width
 	db 26 ; height
 	dw Permissions030
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap030.bin"
-Permissions030:
+Permissions030::
 	INCBIN "data/maps/permissions/permissions030.bin"
 
-Tilemap031:
+Tilemap031::
 	db 28 ; width
 	db 32 ; height
 	dw Permissions031
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap031.bin"
-Permissions031:
+Permissions031::
 	INCBIN "data/maps/permissions/permissions031.bin"
 
-Tilemap032:
+Tilemap032::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions032
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap032.bin"
-Permissions032:
+Permissions032::
 	INCBIN "data/maps/permissions/permissions032.bin"
 
-Tilemap033:
+Tilemap033::
 	db 32 ; width
 	db 30 ; height
 	dw Permissions033
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap033.bin"
-Permissions033:
+Permissions033::
 	INCBIN "data/maps/permissions/permissions033.bin"
 
-Tilemap034:
+Tilemap034::
 	db 32 ; width
 	db 32 ; height
 	dw Permissions034
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap034.bin"
-Permissions034:
+Permissions034::
 	INCBIN "data/maps/permissions/permissions034.bin"
 
-Tilemap035:
+Tilemap035::
 	db 32 ; width
 	db 18 ; height
 	dw Permissions035
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap035.bin"
-Permissions035:
+Permissions035::
 	INCBIN "data/maps/permissions/permissions035.bin"
 
-Tilemap036:
+Tilemap036::
 	db 32 ; width
 	db 32 ; height
 	dw Permissions036
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap036.bin"
-Permissions036:
+Permissions036::
 	INCBIN "data/maps/permissions/permissions036.bin"
 
-Tilemap039:
+Tilemap039::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions039
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap039.bin"
-Permissions039:
+Permissions039::
 	INCBIN "data/maps/permissions/permissions039.bin"
 
-Tilemap03A:
+Tilemap03A::
 	db 24 ; width
 	db 26 ; height
 	dw Permissions03A
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap03A.bin"
-Permissions03A:
+Permissions03A::
 	INCBIN "data/maps/permissions/permissions03A.bin"
 
-Tilemap03B:
+Tilemap03B::
 	db 28 ; width
 	db 32 ; height
 	dw Permissions03B
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap03B.bin"
-Permissions03B:
+Permissions03B::
 	INCBIN "data/maps/permissions/permissions03B.bin"
 
-Tilemap03C:
+Tilemap03C::
 	db 20 ; width
 	db 22 ; height
 	dw Permissions03C
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap03C.bin"
-Permissions03C:
+Permissions03C::
 	INCBIN "data/maps/permissions/permissions03C.bin"
 
-Tilemap03D:
+Tilemap03D::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions03D
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap03D.bin"
-Permissions03D:
+Permissions03D::
 	INCBIN "data/maps/permissions/permissions03D.bin"
 
-Tilemap03E:
+Tilemap03E::
 	db 24 ; width
 	db 32 ; height
 	dw Permissions03E
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap03E.bin"
-Permissions03E:
+Permissions03E::
 	INCBIN "data/maps/permissions/permissions03E.bin"
 
-Tilemap03F:
+Tilemap03F::
 	db 28 ; width
 	db 30 ; height
 	dw Permissions03F
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap03F.bin"
-Permissions03F:
+Permissions03F::
 	INCBIN "data/maps/permissions/permissions03F.bin"
 
-Tilemap040:
+Tilemap040::
 	db 24 ; width
 	db 30 ; height
 	dw Permissions040
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap040.bin"
-Permissions040:
+Permissions040::
 	INCBIN "data/maps/permissions/permissions040.bin"
 
-Tilemap041:
+Tilemap041::
 	db 24 ; width
 	db 30 ; height
 	dw Permissions041
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap041.bin"
-Permissions041:
+Permissions041::
 	INCBIN "data/maps/permissions/permissions041.bin"
 
-Tilemap042:
+Tilemap042::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions042
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap042.bin"
-Permissions042:
+Permissions042::
 	INCBIN "data/maps/permissions/permissions042.bin"
 
-Tilemap043:
+Tilemap043::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions043
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap043.bin"
-Permissions043:
+Permissions043::
 	INCBIN "data/maps/permissions/permissions043.bin"
 
-Tilemap044:
+Tilemap044::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions044
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap044.bin"
-Permissions044:
+Permissions044::
 	INCBIN "data/maps/permissions/permissions044.bin"
 
-Tilemap045:
+Tilemap045::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions045
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap045.bin"
-Permissions045:
+Permissions045::
 	INCBIN "data/maps/permissions/permissions045.bin"
 
-Tilemap046:
+Tilemap046::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions046
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap046.bin"
-Permissions046:
+Permissions046::
 	INCBIN "data/maps/permissions/permissions046.bin"
 
-Tilemap047:
+Tilemap047::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions047
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap047.bin"
-Permissions047:
+Permissions047::
 	INCBIN "data/maps/permissions/permissions047.bin"
 
-Tilemap048:
+Tilemap048::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions048
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap048.bin"
-Permissions048:
+Permissions048::
 	INCBIN "data/maps/permissions/permissions048.bin"
 
-Tilemap049:
+Tilemap049::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions049
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap049.bin"
-Permissions049:
+Permissions049::
 	INCBIN "data/maps/permissions/permissions049.bin"
 
-Tilemap04A:
+Tilemap04A::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions04A
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap04A.bin"
-Permissions04A:
+Permissions04A::
 	INCBIN "data/maps/permissions/permissions04A.bin"
 
-Tilemap04B:
+Tilemap04B::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions04B
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap04B.bin"
-Permissions04B:
+Permissions04B::
 	INCBIN "data/maps/permissions/permissions04B.bin"
 
-Tilemap04C:
+Tilemap04C::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions04C
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap04C.bin"
-Permissions04C:
+Permissions04C::
 	INCBIN "data/maps/permissions/permissions04C.bin"
 
-Tilemap04D:
+Tilemap04D::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions04D
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap04D.bin"
-Permissions04D:
+Permissions04D::
 	INCBIN "data/maps/permissions/permissions04D.bin"
 
-Tilemap04E:
+Tilemap04E::
 	db 20 ; width
 	db 22 ; height
 	dw Permissions04E
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap04E.bin"
-Permissions04E:
+Permissions04E::
 	INCBIN "data/maps/permissions/permissions04E.bin"
 
-Tilemap04F:
+Tilemap04F::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions04F
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap04F.bin"
-Permissions04F:
+Permissions04F::
 	INCBIN "data/maps/permissions/permissions04F.bin"
 
-Tilemap050:
+Tilemap050::
 	db 22 ; width
 	db 18 ; height
 	dw Permissions050
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap050.bin"
-Permissions050:
+Permissions050::
 	INCBIN "data/maps/permissions/permissions050.bin"
 
-Tilemap051:
+Tilemap051::
 	db 6 ; width
 	db 3 ; height
 	dw Permissions051
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap051.bin"
-Permissions051:
+Permissions051::
 	INCBIN "data/maps/permissions/permissions051.bin"
 
-Tilemap052:
+Tilemap052::
 	db 6 ; width
 	db 3 ; height
 	dw Permissions052
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap052.bin"
-Permissions052:
+Permissions052::
 	INCBIN "data/maps/permissions/permissions052.bin"
 
-Tilemap053:
+Tilemap053::
 	db 26 ; width
 	db 26 ; height
 	dw Permissions053
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap053.bin"
-Permissions053:
+Permissions053::
 	INCBIN "data/maps/permissions/permissions053.bin"
 
-Tilemap054:
+Tilemap054::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions054
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap054.bin"
-Permissions054:
+Permissions054::
 	INCBIN "data/maps/permissions/permissions054.bin"
 
-Tilemap055:
+Tilemap055::
 	db 28 ; width
 	db 30 ; height
 	dw Permissions055
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap055.bin"
-Permissions055:
+Permissions055::
 	INCBIN "data/maps/permissions/permissions055.bin"
 
-Tilemap056:
+Tilemap056::
 	db 32 ; width
 	db 32 ; height
 	dw Permissions056
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap056.bin"
-Permissions056:
+Permissions056::
 	INCBIN "data/maps/permissions/permissions056.bin"
 
-Tilemap057:
+Tilemap057::
 	db 12 ; width
 	db 5 ; height
 	dw Permissions057
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap057.bin"
-Permissions057:
+Permissions057::
 	INCBIN "data/maps/permissions/permissions057.bin"
 
-Tilemap058:
+Tilemap058::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions058
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap058.bin"
-Permissions058:
+Permissions058::
 	INCBIN "data/maps/permissions/permissions058.bin"
 
-Tilemap059:
+Tilemap059::
 	db 28 ; width
 	db 30 ; height
 	dw Permissions059
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap059.bin"
-Permissions059:
+Permissions059::
 	INCBIN "data/maps/permissions/permissions059.bin"
 
-Tilemap05A:
+Tilemap05A::
 	db 24 ; width
 	db 24 ; height
 	dw Permissions05A
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap05A.bin"
-Permissions05A:
+Permissions05A::
 	INCBIN "data/maps/permissions/permissions05A.bin"
 
-Tilemap05B:
+Tilemap05B::
 	db 4 ; width
 	db 9 ; height
 	dw Permissions05B
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap05B.bin"
-Permissions05B:
+Permissions05B::
 	INCBIN "data/maps/permissions/permissions05B.bin"
 
-Tilemap05C:
+Tilemap05C::
 	db 4 ; width
 	db 9 ; height
 	dw Permissions05C
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap05C.bin"
-Permissions05C:
+Permissions05C::
 	INCBIN "data/maps/permissions/permissions05C.bin"
 
-Tilemap05D:
+Tilemap05D::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions05D
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap05D.bin"
-Permissions05D:
+Permissions05D::
 	INCBIN "data/maps/permissions/permissions05D.bin"
 
-Tilemap05E:
+Tilemap05E::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions05E
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap05E.bin"
-Permissions05E:
+Permissions05E::
 	INCBIN "data/maps/permissions/permissions05E.bin"
 
-Tilemap05F:
+Tilemap05F::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions05F
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap05F.bin"
-Permissions05F:
+Permissions05F::
 	INCBIN "data/maps/permissions/permissions05F.bin"
 
-Tilemap060:
+Tilemap060::
 	db 24 ; width
 	db 18 ; height
 	dw Permissions060
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap060.bin"
-Permissions060:
+Permissions060::
 	INCBIN "data/maps/permissions/permissions060.bin"
 
-Tilemap061:
+Tilemap061::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions061
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap061.bin"
-Permissions061:
+Permissions061::
 	INCBIN "data/maps/permissions/permissions061.bin"
 
-Tilemap062:
+Tilemap062::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions062
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap062.bin"
-Permissions062:
+Permissions062::
 	INCBIN "data/maps/permissions/permissions062.bin"
 
-Tilemap063:
+Tilemap063::
 	db 28 ; width
 	db 32 ; height
 	dw Permissions063
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap063.bin"
-Permissions063:
+Permissions063::
 	INCBIN "data/maps/permissions/permissions063.bin"
 
-Tilemap064:
+Tilemap064::
 	db 20 ; width
 	db 26 ; height
 	dw Permissions064
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap064.bin"
-Permissions064:
+Permissions064::
 	INCBIN "data/maps/permissions/permissions064.bin"
 
-Tilemap065:
+Tilemap065::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions065
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap065.bin"
-Permissions065:
+Permissions065::
 	INCBIN "data/maps/permissions/permissions065.bin"
 
-Tilemap066:
+Tilemap066::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions066
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap066.bin"
-Permissions066:
+Permissions066::
 	INCBIN "data/maps/permissions/permissions066.bin"
 
-Tilemap067:
+Tilemap067::
 	db 28 ; width
 	db 30 ; height
 	dw Permissions067
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap067.bin"
-Permissions067:
+Permissions067::
 	INCBIN "data/maps/permissions/permissions067.bin"
 
-Tilemap068:
+Tilemap068::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions068
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap068.bin"
-Permissions068:
+Permissions068::
 	INCBIN "data/maps/permissions/permissions068.bin"
 
-Tilemap08B:
+Tilemap08B::
 	db 2 ; width
 	db 4 ; height
 	dw Permissions08B
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap08B.bin"
-Permissions08B:
+Permissions08B::
 	INCBIN "data/maps/permissions/permissions08B.bin"

src/data/maps/tilemaps4.asm

@@ -1,796 +1,796 @@
-Tilemap069:
+Tilemap069::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions069
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap069.bin"
-Permissions069:
+Permissions069::
 	INCBIN "data/maps/permissions/permissions069.bin"
 
-Tilemap06A:
+Tilemap06A::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions06A
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap06A.bin"
-Permissions06A:
+Permissions06A::
 	INCBIN "data/maps/permissions/permissions06A.bin"
 
-Tilemap06B:
+Tilemap06B::
 	db 20 ; width
 	db 24 ; height
 	dw Permissions06B
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap06B.bin"
-Permissions06B:
+Permissions06B::
 	INCBIN "data/maps/permissions/permissions06B.bin"
 
-Tilemap06C:
+Tilemap06C::
 	db 2 ; width
 	db 7 ; height
 	dw Permissions06C
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap06C.bin"
-Permissions06C:
+Permissions06C::
 	INCBIN "data/maps/permissions/permissions06C.bin"
 
-Tilemap06D:
+Tilemap06D::
 	db 3 ; width
 	db 2 ; height
 	dw Permissions06D
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap06D.bin"
-Permissions06D:
+Permissions06D::
 	INCBIN "data/maps/permissions/permissions06D.bin"
 
-Tilemap06E:
+Tilemap06E::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions06E
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap06E.bin"
-Permissions06E:
+Permissions06E::
 	INCBIN "data/maps/permissions/permissions06E.bin"
 
-Tilemap06F:
+Tilemap06F::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions06F
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap06F.bin"
-Permissions06F:
+Permissions06F::
 	INCBIN "data/maps/permissions/permissions06F.bin"
 
-Tilemap070:
+Tilemap070::
 	db 2 ; width
 	db 7 ; height
 	dw Permissions070
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap070.bin"
-Permissions070:
+Permissions070::
 	INCBIN "data/maps/permissions/permissions070.bin"
 
-Tilemap071:
+Tilemap071::
 	db 32 ; width
 	db 24 ; height
 	dw Permissions071
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap071.bin"
-Permissions071:
+Permissions071::
 	INCBIN "data/maps/permissions/permissions071.bin"
 
-Tilemap072:
+Tilemap072::
 	db 20 ; width
 	db 26 ; height
 	dw Permissions072
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap072.bin"
-Permissions072:
+Permissions072::
 	INCBIN "data/maps/permissions/permissions072.bin"
 
-Tilemap073:
+Tilemap073::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions073
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap073.bin"
-Permissions073:
+Permissions073::
 	INCBIN "data/maps/permissions/permissions073.bin"
 
-Tilemap074:
+Tilemap074::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions074
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap074.bin"
-Permissions074:
+Permissions074::
 	INCBIN "data/maps/permissions/permissions074.bin"
 
-Tilemap075:
+Tilemap075::
 	db 28 ; width
 	db 30 ; height
 	dw Permissions075
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap075.bin"
-Permissions075:
+Permissions075::
 	INCBIN "data/maps/permissions/permissions075.bin"
 
-Tilemap076:
+Tilemap076::
 	db 20 ; width
 	db 20 ; height
 	dw Permissions076
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap076.bin"
-Permissions076:
+Permissions076::
 	INCBIN "data/maps/permissions/permissions076.bin"
 
-Tilemap077:
+Tilemap077::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions077
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap077.bin"
-Permissions077:
+Permissions077::
 	INCBIN "data/maps/permissions/permissions077.bin"
 
-Tilemap078:
+Tilemap078::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions078
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap078.bin"
-Permissions078:
+Permissions078::
 	INCBIN "data/maps/permissions/permissions078.bin"
 
-Tilemap079:
+Tilemap079::
 	db 24 ; width
 	db 28 ; height
 	dw Permissions079
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap079.bin"
-Permissions079:
+Permissions079::
 	INCBIN "data/maps/permissions/permissions079.bin"
 
-Tilemap07A:
+Tilemap07A::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions07A
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap07A.bin"
-Permissions07A:
+Permissions07A::
 	INCBIN "data/maps/permissions/permissions07A.bin"
 
-Tilemap07B:
+Tilemap07B::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions07B
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap07B.bin"
-Permissions07B:
+Permissions07B::
 	INCBIN "data/maps/permissions/permissions07B.bin"
 
-Tilemap07C:
+Tilemap07C::
 	db 20 ; width
 	db 32 ; height
 	dw Permissions07C
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap07C.bin"
-Permissions07C:
+Permissions07C::
 	INCBIN "data/maps/permissions/permissions07C.bin"
 
-Tilemap07D:
+Tilemap07D::
 	db 2 ; width
 	db 6 ; height
 	dw Permissions07D
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap07D.bin"
-Permissions07D:
+Permissions07D::
 	INCBIN "data/maps/permissions/permissions07D.bin"
 
-Tilemap07E:
+Tilemap07E::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions07E
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap07E.bin"
-Permissions07E:
+Permissions07E::
 	INCBIN "data/maps/permissions/permissions07E.bin"
 
-Tilemap07F:
+Tilemap07F::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions07F
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap07F.bin"
-Permissions07F:
+Permissions07F::
 	INCBIN "data/maps/permissions/permissions07F.bin"
 
-Tilemap080:
+Tilemap080::
 	db 2 ; width
 	db 6 ; height
 	dw Permissions080
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap080.bin"
-Permissions080:
+Permissions080::
 	INCBIN "data/maps/permissions/permissions080.bin"
 
-Tilemap081:
+Tilemap081::
 	db 24 ; width
 	db 32 ; height
 	dw Permissions081
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap081.bin"
-Permissions081:
+Permissions081::
 	INCBIN "data/maps/permissions/permissions081.bin"
 
-Tilemap082:
+Tilemap082::
 	db 20 ; width
 	db 26 ; height
 	dw Permissions082
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap082.bin"
-Permissions082:
+Permissions082::
 	INCBIN "data/maps/permissions/permissions082.bin"
 
-Tilemap083:
+Tilemap083::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions083
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap083.bin"
-Permissions083:
+Permissions083::
 	INCBIN "data/maps/permissions/permissions083.bin"
 
-Tilemap084:
+Tilemap084::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions084
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap084.bin"
-Permissions084:
+Permissions084::
 	INCBIN "data/maps/permissions/permissions084.bin"
 
-Tilemap085:
+Tilemap085::
 	db 28 ; width
 	db 30 ; height
 	dw Permissions085
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap085.bin"
-Permissions085:
+Permissions085::
 	INCBIN "data/maps/permissions/permissions085.bin"
 
-Tilemap086:
+Tilemap086::
 	db 20 ; width
 	db 22 ; height
 	dw Permissions086
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap086.bin"
-Permissions086:
+Permissions086::
 	INCBIN "data/maps/permissions/permissions086.bin"
 
-Tilemap087:
+Tilemap087::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions087
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap087.bin"
-Permissions087:
+Permissions087::
 	INCBIN "data/maps/permissions/permissions087.bin"
 
-Tilemap088:
+Tilemap088::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions088
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap088.bin"
-Permissions088:
+Permissions088::
 	INCBIN "data/maps/permissions/permissions088.bin"
 
-Tilemap089:
+Tilemap089::
 	db 28 ; width
 	db 24 ; height
 	dw Permissions089
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap089.bin"
-Permissions089:
+Permissions089::
 	INCBIN "data/maps/permissions/permissions089.bin"
 
-Tilemap08A:
+Tilemap08A::
 	db 5 ; width
 	db 5 ; height
 	dw Permissions08A
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap08A.bin"
-Permissions08A:
+Permissions08A::
 	INCBIN "data/maps/permissions/permissions08A.bin"
 
-Tilemap08C:
+Tilemap08C::
 	db 5 ; width
 	db 5 ; height
 	dw Permissions08C
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap08C.bin"
-Permissions08C:
+Permissions08C::
 	INCBIN "data/maps/permissions/permissions08C.bin"
 
-Tilemap08D:
+Tilemap08D::
 	db 2 ; width
 	db 4 ; height
 	dw Permissions08D
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap08D.bin"
-Permissions08D:
+Permissions08D::
 	INCBIN "data/maps/permissions/permissions08D.bin"
 
-Tilemap08E:
+Tilemap08E::
 	db 20 ; width
 	db 26 ; height
 	dw Permissions08E
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap08E.bin"
-Permissions08E:
+Permissions08E::
 	INCBIN "data/maps/permissions/permissions08E.bin"
 
-Tilemap08F:
+Tilemap08F::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions08F
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap08F.bin"
-Permissions08F:
+Permissions08F::
 	INCBIN "data/maps/permissions/permissions08F.bin"
 
-Tilemap090:
+Tilemap090::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions090
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap090.bin"
-Permissions090:
+Permissions090::
 	INCBIN "data/maps/permissions/permissions090.bin"
 
-Tilemap091:
+Tilemap091::
 	db 28 ; width
 	db 28 ; height
 	dw Permissions091
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap091.bin"
-Permissions091:
+Permissions091::
 	INCBIN "data/maps/permissions/permissions091.bin"
 
-Tilemap092:
+Tilemap092::
 	db 20 ; width
 	db 26 ; height
 	dw Permissions092
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap092.bin"
-Permissions092:
+Permissions092::
 	INCBIN "data/maps/permissions/permissions092.bin"
 
-Tilemap093:
+Tilemap093::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions093
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap093.bin"
-Permissions093:
+Permissions093::
 	INCBIN "data/maps/permissions/permissions093.bin"
 
-Tilemap094:
+Tilemap094::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions094
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap094.bin"
-Permissions094:
+Permissions094::
 	INCBIN "data/maps/permissions/permissions094.bin"
 
-Tilemap095:
+Tilemap095::
 	db 32 ; width
 	db 18 ; height
 	dw Permissions095
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap095.bin"
-Permissions095:
+Permissions095::
 	INCBIN "data/maps/permissions/permissions095.bin"
 
-Tilemap096:
+Tilemap096::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions096
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap096.bin"
-Permissions096:
+Permissions096::
 	INCBIN "data/maps/permissions/permissions096.bin"
 
-Tilemap097:
+Tilemap097::
 	db 4 ; width
 	db 3 ; height
 	dw Permissions097
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap097.bin"
-Permissions097:
+Permissions097::
 	INCBIN "data/maps/permissions/permissions097.bin"
 
-Tilemap098:
+Tilemap098::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions098
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap098.bin"
-Permissions098:
+Permissions098::
 	INCBIN "data/maps/permissions/permissions098.bin"
 
-Tilemap099:
+Tilemap099::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions099
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap099.bin"
-Permissions099:
+Permissions099::
 	INCBIN "data/maps/permissions/permissions099.bin"
 
-Tilemap09A:
+Tilemap09A::
 	db 2 ; width
 	db 4 ; height
 	dw Permissions09A
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap09A.bin"
-Permissions09A:
+Permissions09A::
 	INCBIN "data/maps/permissions/permissions09A.bin"
 
-Tilemap09B:
+Tilemap09B::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions09B
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap09B.bin"
-Permissions09B:
+Permissions09B::
 	INCBIN "data/maps/permissions/permissions09B.bin"
 
-Tilemap09C:
+Tilemap09C::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions09C
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap09C.bin"
-Permissions09C:
+Permissions09C::
 	INCBIN "data/maps/permissions/permissions09C.bin"
 
-Tilemap09D:
+Tilemap09D::
 	db 2 ; width
 	db 4 ; height
 	dw Permissions09D
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap09D.bin"
-Permissions09D:
+Permissions09D::
 	INCBIN "data/maps/permissions/permissions09D.bin"
 
-Tilemap09E:
+Tilemap09E::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions09E
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap09E.bin"
-Permissions09E:
+Permissions09E::
 	INCBIN "data/maps/permissions/permissions09E.bin"
 
-Tilemap09F:
+Tilemap09F::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions09F
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap09F.bin"
-Permissions09F:
+Permissions09F::
 	INCBIN "data/maps/permissions/permissions09F.bin"
 
-Tilemap0A0:
+Tilemap0A0::
 	db 24 ; width
 	db 22 ; height
 	dw Permissions0A0
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0A0.bin"
-Permissions0A0:
+Permissions0A0::
 	INCBIN "data/maps/permissions/permissions0A0.bin"
 
-Tilemap0A1:
+Tilemap0A1::
 	db 8 ; width
 	db 5 ; height
 	dw Permissions0A1
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0A1.bin"
-Permissions0A1:
+Permissions0A1::
 	INCBIN "data/maps/permissions/permissions0A1.bin"
 
-Tilemap0A2:
+Tilemap0A2::
 	db 8 ; width
 	db 5 ; height
 	dw Permissions0A2
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0A2.bin"
-Permissions0A2:
+Permissions0A2::
 	INCBIN "data/maps/permissions/permissions0A2.bin"
 
-Tilemap0A3:
+Tilemap0A3::
 	db 20 ; width
 	db 22 ; height
 	dw Permissions0A3
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0A3.bin"
-Permissions0A3:
+Permissions0A3::
 	INCBIN "data/maps/permissions/permissions0A3.bin"
 
-Tilemap0A4:
+Tilemap0A4::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions0A4
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0A4.bin"
-Permissions0A4:
+Permissions0A4::
 	INCBIN "data/maps/permissions/permissions0A4.bin"
 
-Tilemap0A5:
+Tilemap0A5::
 	db 28 ; width
 	db 30 ; height
 	dw Permissions0A5
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0A5.bin"
-Permissions0A5:
+Permissions0A5::
 	INCBIN "data/maps/permissions/permissions0A5.bin"
 
-Tilemap0A6:
+Tilemap0A6::
 	db 32 ; width
 	db 26 ; height
 	dw Permissions0A6
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0A6.bin"
-Permissions0A6:
+Permissions0A6::
 	INCBIN "data/maps/permissions/permissions0A6.bin"
 
-Tilemap0A7:
+Tilemap0A7::
 	db 5 ; width
 	db 3 ; height
 	dw Permissions0A7
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0A7.bin"
-Permissions0A7:
+Permissions0A7::
 	INCBIN "data/maps/permissions/permissions0A7.bin"
 
-Tilemap0A8:
+Tilemap0A8::
 	db 5 ; width
 	db 3 ; height
 	dw Permissions0A8
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0A8.bin"
-Permissions0A8:
+Permissions0A8::
 	INCBIN "data/maps/permissions/permissions0A8.bin"
 
-Tilemap0A9:
+Tilemap0A9::
 	db 5 ; width
 	db 3 ; height
 	dw Permissions0A9
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0A9.bin"
-Permissions0A9:
+Permissions0A9::
 	INCBIN "data/maps/permissions/permissions0A9.bin"
 
-Tilemap0AA:
+Tilemap0AA::
 	db 5 ; width
 	db 3 ; height
 	dw Permissions0AA
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0AA.bin"
-Permissions0AA:
+Permissions0AA::
 	INCBIN "data/maps/permissions/permissions0AA.bin"
 
-Tilemap0AB:
+Tilemap0AB::
 	db 2 ; width
 	db 2 ; height
 	dw Permissions0AB
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0AB.bin"
-Permissions0AB:
+Permissions0AB::
 	INCBIN "data/maps/permissions/permissions0AB.bin"
 
-Tilemap0AC:
+Tilemap0AC::
 	db 2 ; width
 	db 2 ; height
 	dw Permissions0AC
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0AC.bin"
-Permissions0AC:
+Permissions0AC::
 	INCBIN "data/maps/permissions/permissions0AC.bin"
 
-Tilemap0AD:
+Tilemap0AD::
 	db 3 ; width
 	db 2 ; height
 	dw Permissions0AD
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0AD.bin"
-Permissions0AD:
+Permissions0AD::
 	INCBIN "data/maps/permissions/permissions0AD.bin"
 
-Tilemap0AE:
+Tilemap0AE::
 	db 4 ; width
 	db 2 ; height
 	dw Permissions0AE
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0AE.bin"
-Permissions0AE:
+Permissions0AE::
 	INCBIN "data/maps/permissions/permissions0AE.bin"
 
-Tilemap0AF:
+Tilemap0AF::
 	db 4 ; width
 	db 2 ; height
 	dw Permissions0AF
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0AF.bin"
-Permissions0AF:
+Permissions0AF::
 	INCBIN "data/maps/permissions/permissions0AF.bin"
 
-Tilemap0B0:
+Tilemap0B0::
 	db 32 ; width
 	db 26 ; height
 	dw Permissions0B0
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0B0.bin"
-Permissions0B0:
+Permissions0B0::
 	INCBIN "data/maps/permissions/permissions0B0.bin"
 
-Tilemap0B1:
+Tilemap0B1::
 	db 20 ; width
 	db 26 ; height
 	dw Permissions0B1
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0B1.bin"
-Permissions0B1:
+Permissions0B1::
 	INCBIN "data/maps/permissions/permissions0B1.bin"
 
-Tilemap0B2:
+Tilemap0B2::
 	db 24 ; width
 	db 24 ; height
 	dw Permissions0B2
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0B2.bin"
-Permissions0B2:
+Permissions0B2::
 	INCBIN "data/maps/permissions/permissions0B2.bin"
 
-Tilemap0B3:
+Tilemap0B3::
 	db 22 ; width
 	db 18 ; height
 	dw Permissions0B3
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0B3.bin"
-Permissions0B3:
+Permissions0B3::
 	INCBIN "data/maps/permissions/permissions0B3.bin"
 
-Tilemap0B4:
+Tilemap0B4::
 	db 6 ; width
 	db 3 ; height
 	dw Permissions0B4
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0B4.bin"
-Permissions0B4:
+Permissions0B4::
 	INCBIN "data/maps/permissions/permissions0B4.bin"
 
-Tilemap0B5:
+Tilemap0B5::
 	db 6 ; width
 	db 3 ; height
 	dw Permissions0B5
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0B5.bin"
-Permissions0B5:
+Permissions0B5::
 	INCBIN "data/maps/permissions/permissions0B5.bin"
 
-Tilemap0B6:
+Tilemap0B6::
 	db 30 ; width
 	db 32 ; height
 	dw Permissions0B6
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0B6.bin"
-Permissions0B6:
+Permissions0B6::
 	INCBIN "data/maps/permissions/permissions0B6.bin"
 
-Tilemap0B7:
+Tilemap0B7::
 	db 30 ; width
 	db 32 ; height
 	dw Permissions0B7
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0B7.bin"
-Permissions0B7:
+Permissions0B7::
 	INCBIN "data/maps/permissions/permissions0B7.bin"
 
-Tilemap0B8:
+Tilemap0B8::
 	db 32 ; width
 	db 32 ; height
 	dw Permissions0B8
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0B8.bin"
-Permissions0B8:
+Permissions0B8::
 	INCBIN "data/maps/permissions/permissions0B8.bin"
 
-Tilemap0B9:
+Tilemap0B9::
 	db 12 ; width
 	db 5 ; height
 	dw Permissions0B9
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0B9.bin"
-Permissions0B9:
+Permissions0B9::
 	INCBIN "data/maps/permissions/permissions0B9.bin"
 
-Tilemap0BA:
+Tilemap0BA::
 	db 20 ; width
 	db 18 ; height
 	dw Permissions0BA
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0BA.bin"
-Permissions0BA:
+Permissions0BA::
 	INCBIN "data/maps/permissions/permissions0BA.bin"
 
-Tilemap0BC:
+Tilemap0BC::
 	db 2 ; width
 	db 4 ; height
 	dw Permissions0BC
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0BC.bin"
-Permissions0BC:
+Permissions0BC::
 	INCBIN "data/maps/permissions/permissions0BC.bin"
 
-Tilemap0C1:
+Tilemap0C1::
 	db 4 ; width
 	db 2 ; height
 	dw Permissions0C1
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0C1.bin"
-Permissions0C1:
+Permissions0C1::
 	INCBIN "data/maps/permissions/permissions0C1.bin"
 
-Tilemap0C4:
+Tilemap0C4::
 	db 2 ; width
 	db 4 ; height
 	dw Permissions0C4
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0C4.bin"
-Permissions0C4:
+Permissions0C4::
 	INCBIN "data/maps/permissions/permissions0C4.bin"
 
-Tilemap0C7:
+Tilemap0C7::
 	db 4 ; width
 	db 2 ; height
 	dw Permissions0C7
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0C7.bin"
-Permissions0C7:
+Permissions0C7::
 	INCBIN "data/maps/permissions/permissions0C7.bin"
 
-Tilemap0C9:
+Tilemap0C9::
 	db 2 ; width
 	db 4 ; height
 	dw Permissions0C9
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0C9.bin"
-Permissions0C9:
+Permissions0C9::
 	INCBIN "data/maps/permissions/permissions0C9.bin"
 
-Tilemap0CA:
+Tilemap0CA::
 	db 4 ; width
 	db 2 ; height
 	dw Permissions0CA
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0CA.bin"
-Permissions0CA:
+Permissions0CA::
 	INCBIN "data/maps/permissions/permissions0CA.bin"
 
-Tilemap0CC:
+Tilemap0CC::
 	db 4 ; width
 	db 2 ; height
 	dw Permissions0CC
 	db $1 ; unknown
 	INCBIN "data/maps/tiles/tilemap0CC.bin"
-Permissions0CC:
+Permissions0CC::
 	INCBIN "data/maps/permissions/permissions0CC.bin"
 
-Tilemap0E3:
+Tilemap0E3::
 	db 6 ; width
 	db 6 ; height
 	dw NULL

src/engine/bank01.asm

@@ -0,0 +1,109 @@
+SECTION "Bank 1@563e", ROMX[$563e], BANK[$1]
+
+ZeroObjectPositionsAndToggleOAMCopy:
+	call ZeroObjectPositions
+	ld a, $01
+	ld [wVBlankOAMCopyToggle], a
+	ret
+
+SECTION "Bank 1@59f4", ROMX[$59f4], BANK[$1]
+
+SetLineSeparation:
+	ld [wLineSeparation], a
+	ret
+
+SetZeroLineSeparation:
+	xor a
+	jr SetLineSeparation
+; 0x59fb
+
+SECTION "Bank 1@610c", ROMX[$610c], BANK[$1]
+
+LoadPlayerDeck:
+	call EnableSRAM
+	ld a, [sb7a0]
+	ld l, a
+	ld h, $60
+	call HtimesL
+	ld de, sDeck1Cards
+	add hl, de
+	ld e, l
+	ld d, h
+	ld hl, wPlayerDeck
+	call LoadDeckFromSRAM
+	call DisableSRAM
+	ret
+; 0x6128
+
+SECTION "Bank 1@68bc", ROMX[$68bc], BANK[$1]
+
+; loads deck saved in SRAM to hl
+LoadDeckFromSRAM:
+	push hl
+	push de
+	push bc
+	ld a, $08
+.loop_outer
+	push af
+	ld a, [de]
+	inc de
+	ld b, a
+	ld c, 8 ; number of bits
+.loop_inner
+	ld a, [de]
+	inc de
+	ld [hli], a
+	xor a
+	rl b
+	rla
+	ld [hli], a
+	dec c
+	jr nz, .loop_inner
+	pop af
+	dec a
+	jr nz, .loop_outer
+	pop bc
+	pop de
+	pop hl
+	ret
+; 0x68da
+
+SECTION "Bank 1@6bc8", ROMX[$6bc8], BANK[$1]
+
+SetDefaultPalettes:
+	call SetFontAndTextBoxFrameColor
+	ld a, %11100100
+	ld [wOBP0], a
+	ld [wBGP], a
+	ld a, $01 ; equivalent to FLUSH_ONE_PAL
+	ldh [hFlushPaletteFlags], a
+	ld hl, Pals_6f0b0 - $4000
+	ld de, wObjectPalettesCGB
+	ld c, CGB_PAL_SIZE
+	call CopyFontsOrDuelGraphicsBytes
+	call FlushAllPalettes
+	ret
+
+SetFontAndTextBoxFrameColor:
+	ld a, $01
+	ld [wTextBoxFrameType], a
+	ld hl, Pals_6f0b0 - $4000
+	ld de, wBackgroundPalettesCGB
+	ld c, CGB_PAL_SIZE
+	call CopyFontsOrDuelGraphicsBytes
+	push de
+	call EnableSRAM
+	ld a, [sTextBoxFrameColor]
+	call DisableSRAM
+	inc a
+	add a
+	add a
+	add a ; *CGB_PAL_SIZE
+	ld e, a
+	ld d, $00
+	ld hl, Pals_6f0b0 - $4000
+	add hl, de
+	pop de
+	ld c, CGB_PAL_SIZE
+	call CopyFontsOrDuelGraphicsBytes
+	ret

src/engine/bank03.asm

@@ -3,14 +3,14 @@
 _CoreGameLoop::
 	call Func_c240
 .intro
-	farcall $4, $5641 ; play intro and title screen
+	farcall IntroAndTitleScreen
 	ld a, PLAYER_TURN
 	ldh [hWhoseTurn], a
 	call Func_c249
 	xor a
-	call Func_3062
+	call PlaySong
 	xor a
-	call Func_3073
+	call PlaySFX
 .start_menu_loop
 	call HandleStartMenu
 	ld hl, .StartMenuFunctionTable
@@ -27,16 +27,16 @@ _CoreGameLoop::
 StartMenu_NewGame:
 	ld hl, wd554
 	bit 0, [hl]
-	jr z, .asm_c037
-	farcall $7, $4f81
+	jr z, .no_save_data
+	farcall AskToOverwriteSaveData
 	ret c
-.asm_c037
+.no_save_data
 	farcall $6, $58f8
 	call Func_e97a
 	call Func_c24d
 	call Func_eb97
 	xor a
-	farcall $7, $5475
+	farcall Func_1d475
 	ld a, $04
 	ld [wd54c], a
 	xor a
@@ -51,12 +51,12 @@ StartMenu_ContinueFromDiary:
 	jr z, .asm_c067
 	bit 1, [hl]
 	jr z, .asm_c067
-	farcall $7, $4fcf
+	farcall AskToContinueFromDiaryInsteadOfDuel
 	ret c
 .asm_c067
 	call Func_eaea
 	xor a
-	call Func_3062
+	call PlaySong
 	ld a, [wd54c]
 	cp $04
 	jr z, .asm_c0a0
@@ -69,7 +69,7 @@ StartMenu_ContinueFromDiary:
 	call Func_c29d
 	call Func_e9a7
 	ld a, $01
-	farcall $7, $5475
+	farcall Func_1d475
 	ld hl, wd583
 	set 7, [hl]
 	ld a, $02
@@ -80,7 +80,7 @@ StartMenu_ContinueFromDiary:
 
 .asm_c0a0
 	ld a, $01
-	farcall $7, $5475
+	farcall Func_1d475
 	call Func_3087
 	scf
 	ret
@@ -93,12 +93,12 @@ StartMenu_ContinueFromDiary:
 	call Func_c29d
 	call Func_e9a7
 	ld a, $01
-	farcall $7, $5475
+	farcall Func_1d475
 	call DisableLCD
 	farcall $4, $4b9c
 	farcall $4, $455e
 	farcall $4, $4417
-	farcall $7, $4990
+	farcall SaveTargetFadePals
 	farcall $4, $509f
 	call DoFrame
 	ld a, $0e
@@ -115,9 +115,9 @@ StartMenu_ContinueFromDiary:
 
 StartMenu_ContinueDuel:
 	ld a, $01
-	farcall $7, $5475
+	farcall Func_1d475
 	xor a
-	call Func_3062
+	call PlaySong
 	call Func_eb16
 	ld a, [wd550]
 	ld b, $01
@@ -247,7 +247,7 @@ HandleStartMenu:
 Func_c240:
 	xor a
 	ld [wd674], a
-	farcall $4, $7dfa
+	farcall Func_13dfa
 	ret
 
 Func_c249:
@@ -831,12 +831,12 @@ Func_d398:
 	farcall $4, $4b9c
 	farcall $4, $455e
 	farcall $4, $4417
-	farcall $7, $4990
+	farcall SaveTargetFadePals
 	farcall $4, $509f
 	call DoFrame
 	ld a, $00
 	ld b, $00
-	farcall $7, $4909
+	farcall StartPalFadeFromBlackOrWhite
 	ld a, $0b
 	ld [wd582], a
 	ld hl, wd583
@@ -876,11 +876,11 @@ Func_d3e9::
 	db -1,  0
 
 Func_d411:
-	call Func_3078
-	ld a, $06
-	call Func_3062
+	call PauseSong
+	ld a, MUSIC_PCMAINMENU
+	call PlaySong
 	farcall $4, $50c6
-	call Func_307d
+	call ResumeSong
 	ret
 
 Func_d421::

src/engine/bank11.asm

@@ -0,0 +1,470 @@
+SECTION "Bank 11@4039", ROMX[$4039], BANK[$11]
+
+; counts number of cards in
+; $0000 terminated list in hl
+; ouptut:
+;  a = number of cards
+CountCardsInHL:
+	push bc
+	push hl
+	xor a
+	ld c, a
+.loop
+	ld a, [hli]
+	ld b, a
+	ld a, [hli]
+	or b
+	jr z, .asm_44046
+	inc c
+	jr .loop
+.asm_44046
+	ld a, c
+	pop hl
+	pop bc
+	ret
+
+; input:
+;  hl = card list
+;  de = card ID to search for
+; output:
+;  carry set if not found
+;  a = index in list if found
+SearchCardInListInHL:
+	push bc
+	push de
+	push hl
+	xor a
+.loop_cards
+	push af
+	ld a, [hli]
+	ld c, a
+	ld a, [hli]
+	ld b, a
+	or c
+	jr z, .not_found
+	ld a, d
+	cp b
+	jr c, .not_equal
+	jr nz, .not_equal
+	ld a, e
+	cp c
+.not_equal
+	jr z, .found
+	pop af
+	inc a
+	jr .loop_cards
+.not_found
+	pop af
+	xor a
+	scf
+	jr .done
+.found
+	pop af
+	scf
+	ccf
+.done
+	pop hl
+	pop de
+	pop bc
+	ret
+; 0x44070
+
+SECTION "Bank 11@426a", ROMX[$426a], BANK[$11]
+
+; appends card ID in de to list in hl
+AppendCardToListInHL:
+	push af
+	push bc
+	push hl
+.loop_cards
+	ld a, [hli]
+	ld c, a
+	ld a, [hli]
+	ld b, a
+	or c
+	jr nz, .loop_cards
+	inc hl
+	xor a
+	ld [hld], a ; terminating byte
+	ld [hld], a ;
+	ld a, d
+	ld [hld], a ; card ID
+	ld [hl], e  ;
+	pop hl
+	pop bc
+	pop af
+	ret
+; 0x4427f
+
+SECTION "Bank 11@43d4", ROMX[$43d4], BANK[$11]
+
+; filters card list in hl
+; based on rarity in c and value in b:
+;    $0: only pkmn
+;    $1: only trainers
+;  > $1: only energy
+; input:
+;  b = filter option
+;  c = card rarity
+; output:
+;  wDuelTempList = filtered list
+;  a = number of cards in filtered list
+FilterCardListInHL:
+	push bc
+	push de
+	push hl
+	xor a
+	push af
+	ld a, LOW(wDuelTempList)
+	ld [wFilteredListPtr + 0], a
+	ld a, HIGH(wDuelTempList)
+	ld [wFilteredListPtr + 1], a
+.loop_cards
+	ld a, [hli]
+	ld e, a
+	ld a, [hli]
+	ld d, a
+	or e
+	jr z, .done
+	call LoadCardDataToBuffer1_FromCardID
+	ld a, [wLoadedCard1Rarity]
+	cp c
+	jr nz, .loop_cards
+	ld a, b
+	cp $01
+	jr z, .only_trainers
+	jr nc, .only_energy
+; only pkmn
+	ld a, [wLoadedCard1Type]
+	cp TYPE_ENERGY
+	jr nc, .loop_cards
+	jr .append_card
+.only_trainers
+	ld a, [wLoadedCard1Type]
+	cp TYPE_TRAINER
+	jr nz, .loop_cards
+	jr .append_card
+.only_energy
+	ld a, [wLoadedCard1Type]
+	cp TYPE_ENERGY
+	jr c, .loop_cards
+	cp TYPE_TRAINER
+	jr z, .loop_cards
+	jr .append_card
+
+.append_card
+; writes this card ID to the next entry in the list
+	push hl
+	ld a, [wFilteredListPtr + 0]
+	ld l, a
+	ld a, [wFilteredListPtr + 1]
+	ld h, a
+	ld a, e
+	ld [hli], a
+	ld a, d
+	ld [hli], a
+	ld a, l
+	ld [wFilteredListPtr + 0], a
+	ld a, h
+	ld [wFilteredListPtr + 1], a
+	pop hl
+	pop af
+	inc a
+	push af
+	jr .loop_cards
+
+.done
+; add terminating bytes
+	ld a, [wFilteredListPtr + 0]
+	ld l, a
+	ld a, [wFilteredListPtr + 1]
+	ld h, a
+	xor a
+	ld [hli], a
+	ld [hl], a
+	pop af
+	pop hl
+	pop de
+	pop bc
+	ret
+
+; shuffle card list in hl by running
+; random card swapping algorithm 40 times
+ShuffleCardsInHL:
+	push af
+	push bc
+	push de
+	push hl
+	call CountCardsInHL
+	or a
+	jr z, .done ; no cards in list
+	ld b, a
+	ld c, 40
+
+.loop
+	push bc
+	push hl
+	ld e, l
+	ld d, h
+
+; pick 2 random cards from list
+; then swap them
+	ld a, b
+	call Random
+	sla a
+	add l
+	ld l, a
+	jr nc, .no_carry1
+	inc h
+.no_carry1
+	ld a, b
+	call Random
+	sla a
+	add e
+	ld e, a
+	jr nc, .no_carry2
+	inc d
+.no_carry2
+	ld b, [hl]
+	ld a, [de]
+	ld [hl], a
+	ld a, b
+	ld [de], a
+	inc hl
+	inc de
+	ld b, [hl]
+	ld a, [de]
+	ld [hl], a
+	ld a, b
+	ld [de], a
+	pop hl
+	pop bc
+	dec c
+	jr nz, .loop
+
+.done
+	pop hl
+	pop de
+	pop bc
+	pop af
+	ret
+; 0x44481
+
+SECTION "Bank 11@44bd", ROMX[$44bd], BANK[$11]
+
+_ChooseTitleScreenCards:
+	push af
+	push bc
+	push de
+	push hl
+	push hl
+	xor a
+	ld [hli], a
+	ld [hld], a
+	xor a ; unnecessary
+	ld [wIntroCardsRepeatsAllowed], a
+
+	call EnableSRAM
+	ld hl, sDeck1Name
+	ld c, $05
+.loop_decks
+	ld a, [hli]
+	ld e, a
+	ld a, [hld]
+	or e
+	jr nz, .got_deck
+	ld de, $60
+	add hl, de
+	dec c
+	jr nz, .loop_decks
+
+; no decks in memory,
+; use the default cards
+	call DisableSRAM
+	ld hl, .DefaultIntroCards
+	pop de
+	ld bc, 2 * 9
+	call CopyDataHLtoDE_SaveRegisters
+	jp .done
+
+.got_deck
+	call DisableSRAM
+
+	bank1call LoadPlayerDeck
+	xor a
+	ld [wPlayerDeck + $78], a ; terminating bytes
+	ld [wPlayerDeck + $79], a ; for wPlayerDeck
+	pop hl
+
+	ld a, NUM_TITLE_SCREEN_CARDS
+	ld [wRemainingIntroCards], a
+.star_pkmn
+	push hl
+	ld hl, wPlayerDeck
+	lb bc, $0, STAR
+	call FilterCardListInHL
+	pop hl
+	ld b, a
+	or a
+	jr z, .diamond_pkmn
+	ld c, $00
+	call .AppendCards
+.diamond_pkmn
+	push hl
+	ld hl, wPlayerDeck
+	lb bc, $0, DIAMOND
+	call FilterCardListInHL
+	pop hl
+	ld b, a
+	or a
+	jr z, .circle_pkmn
+	ld c, $00
+	call .AppendCards
+.circle_pkmn
+	push hl
+	ld hl, wPlayerDeck
+	lb bc, $0, CIRCLE
+	call FilterCardListInHL
+	pop hl
+	ld b, a
+	or a
+	jr z, .star_trainers
+	ld c, $00
+	call .AppendCards
+.star_trainers
+	push hl
+	ld hl, wPlayerDeck
+	lb bc, $1, STAR
+	call FilterCardListInHL
+	pop hl
+	ld b, a
+	or a
+	jr z, .diamond_trainers
+	ld c, $00
+	call .AppendCards
+.diamond_trainers
+	push hl
+	ld hl, wPlayerDeck
+	lb bc, $1, DIAMOND
+	call FilterCardListInHL
+	pop hl
+	ld b, a
+	or a
+	jr z, .circle_trainers
+	ld c, $00
+	call .AppendCards
+.circle_trainers
+	push hl
+	ld hl, wPlayerDeck
+	lb bc, $1, CIRCLE
+	call FilterCardListInHL
+	pop hl
+	ld b, a
+	or a
+	jr z, .star_energy
+	ld c, $00
+	call ShuffleCardsInHL
+	call .AppendCards
+.star_energy
+	push hl
+	ld hl, wPlayerDeck
+	lb bc, $2, STAR
+	call FilterCardListInHL
+	pop hl
+	ld b, a
+	or a
+	jr z, .diamond_energy
+	ld c, $00
+	call .AppendCards
+.diamond_energy
+	push hl
+	ld hl, wPlayerDeck
+	lb bc, $2, DIAMOND
+	call FilterCardListInHL
+	pop hl
+	ld b, a
+	or a
+	jr z, .circle_energy
+	ld c, $00
+	call .AppendCards
+.circle_energy
+	push hl
+	ld hl, wPlayerDeck
+	lb bc, $2, CIRCLE
+	call FilterCardListInHL
+	pop hl
+	ld b, a
+	or a
+	jr z, .allow_duplicates
+	ld c, $00
+	call .AppendCards
+.allow_duplicates
+	ld a, TRUE
+	ld [wIntroCardsRepeatsAllowed], a
+	ld a, [wRemainingIntroCards]
+	or a
+	jp nz, .star_pkmn
+.done
+	pop hl
+	pop de
+	pop bc
+	pop af
+	ret
+
+.AppendCards:
+	; shuffle card list
+	push hl
+	ld hl, wDuelTempList
+	call ShuffleCardsInHL
+	pop hl
+
+.loop_cards
+	push hl
+	ld hl, wDuelTempList
+	ld a, c
+	sla a
+	add l
+	ld l, a
+	jr nc, .no_carry
+	inc h
+.no_carry
+	ld a, [hli]
+	ld e, a
+	ld d, [hl]
+	pop hl
+	call .TryAppend
+	inc c
+	ld a, c
+	cp b
+	jr nz, .loop_cards
+	ret
+
+.TryAppend:
+; appends if wIntroCardsRepeatsAllowed != 0
+; or otherwise, if card is not in list already
+	ld a, [wRemainingIntroCards]
+	or a
+	ret z
+	ld a, [wIntroCardsRepeatsAllowed]
+	or a
+	jr nz, .append
+	call SearchCardInListInHL
+	jr c, .append
+	ret
+.append
+	call AppendCardToListInHL
+	ld a, [wRemainingIntroCards]
+	dec a
+	ld [wRemainingIntroCards], a
+	ret
+
+.DefaultIntroCards:
+	dw BULBASAUR_LV12
+	dw CHARMANDER_LV9
+	dw SQUIRTLE_LV16
+	dw PIKACHU_LV13
+	dw DARK_MACHOKE
+	dw MEW_LV23
+	dw MEOWTH_LV13
+	dw HERE_COMES_TEAM_ROCKET
+	dw $0000

src/engine/bank4b.asm

@@ -111,13 +111,14 @@ Func_12c06e::
 	pop af
 	ret
 
-Func_12c084:
+; bc = FRAMESET_* constant
+GetFramesetPointer:
 	push af
 	sla c
 	rl b
 	sla c
 	rl b
-	ld hl, GfxUnknown3
+	ld hl, Framesets
 	add hl, bc
 	ld a, [hli]
 	add $4b
@@ -157,6 +158,7 @@ SECTION "Bank 4B@410b", ROMX[$410b], BANK[$4b]
 ; c = $00 to select from Tiles0
 ;     $80 to select from Tiles1
 ; b:hl = tilemap pointer
+; de = coordinates
 Func_12c10b:
 	push af
 	push de
@@ -329,104 +331,106 @@ Func_12c1c1:
 SECTION "Bank 4B@42a6", ROMX[$42a6], BANK[$4b]
 
 ; bc = TILESET_* constant
-Func_12c2a6::
+LoadSpriteAnimGfx::
 	push bc
 	push de
 	push hl
-	ld hl, wd944
-	ld a, [wd943]
+	ld hl, wSpriteTilesets
+	ld a, [wNumSpriteTilesets]
 	and a
-	jr z, .asm_12c2c3
+	jr z, .load_tiles
 	ld e, a
-.asm_12c2b3
+.loop_loaded_tiles
 	ld a, [hl]
 	cp c
-	jr nz, .asm_12c2bc
+	jr nz, .next_loaded_tile
 	inc hl
 	ld a, [hld]
 	cp b
-	jr z, .asm_12c2d8
-.asm_12c2bc
+	jr z, .got_tiles
+.next_loaded_tile
 	inc hl
 	inc hl
 	inc hl
 	inc hl
 	dec e
-	jr nz, .asm_12c2b3
-.asm_12c2c3
+	jr nz, .loop_loaded_tiles
+
+.load_tiles
 	push bc
 	push hl
-	ld hl, wd943
+	ld hl, wNumSpriteTilesets
 	inc [hl]
 	call GetTilesetGfxPointer
-	call Func_38e8
+	call LoadGfxFromTileset
 	pop hl
 	pop bc
-	ld [hl], c
+	ld [hl], c ; tileset ID
+	inc hl     ;
+	ld [hl], b ;
 	inc hl
-	ld [hl], b
-	inc hl
-	ld [hl], a
+	ld [hl], a ; tile offset
 	jr .done
-.asm_12c2d8
+
+.got_tiles
 	inc hl
 	inc hl
-	ld a, [hl]
+	ld a, [hl] ; tile offset
 .done
 	pop hl
 	pop de
 	pop bc
 	ret
 
-Func_12c2df:
+UpdateSpriteAnim:
 	push af
 	push bc
 	push de
 	push hl
-	ld a, [hl]
-	and $d0
+	ld a, [hl] ; SPRITEANIMSTRUCT_FLAGS
+	and SPRITEANIMSTRUCT_ANIMATING | SPRITEANIMSTRUCT_FLAG6 | SPRITEANIMSTRUCT_ACTIVE
 	jr z, .done
 	push hl
-	call Func_12c3c6
-	call Func_12c345
-	jr nz, .asm_12c33c
+	call LoadSpriteAnim
+	call DecrementSpriteAnimStartDelay
+	jr nz, .apply_changes ; still delaying
 	call Func_12c35c
-	ld hl, wd976
-	bit 4, [hl]
+	ld hl, wCurSpriteAnim
+	bit SPRITEANIMSTRUCT_ANIMATING_F, [hl] ; SPRITEANIMSTRUCT_FLAGS
 	jr z, .asm_12c2fe
-	call Func_12c34f
+	call DecrementSpriteAnimFrameDuration
 .asm_12c2fe
-	ld a, [wd97c]
+	ld a, [wCurSpriteAnimFramesetID + 0]
 	ld c, a
-	ld a, [wd97d]
+	ld a, [wCurSpriteAnimFramesetID + 1]
 	ld b, a
-	call Func_12c084
-	ld a, [wd97b]
+	call GetFramesetPointer
+	ld a, [wCurSpriteAnimFrameIndex]
 	ld c, a
-	call Func_3992
+	call GetFramesetData
 	ld a, c
 	ld [wd975], a
-	ld hl, wd976
-	bit 6, [hl]
-	jr z, .asm_12c33c
-	ld a, [wd980 + 0]
+	ld hl, wCurSpriteAnim
+	bit SPRITEANIMSTRUCT_FLAG6_F, [hl] ; SPRITEANIMSTRUCT_FLAGS
+	jr z, .apply_changes
+	ld a, [wCurSpriteAnimAnimID + 0]
 	ld c, a
-	ld a, [wd980 + 1]
+	ld a, [wCurSpriteAnimAnimID + 1]
 	ld b, a
 	call GetSpriteAnimationGfxPointer
 	ld a, [wd975]
 	ld c, a
 	cp $ff
-	jr z, .asm_12c33c
-	ld a, [wd979]
+	jr z, .apply_changes
+	ld a, [wCurSpriteAnimXPos]
 	ld d, a
-	ld a, [wd97a]
+	ld a, [wCurSpriteAnimYPos]
 	ld e, a
-	ld a, [wd97f]
+	ld a, [wCurSpriteAnimTileOffset]
 	call Func_3924
-.asm_12c33c
+.apply_changes
 	pop hl
-	call Func_12c3d0
+	call WriteCurSpriteAnim
 .done
 	pop hl
 	pop de
@@ -434,147 +438,151 @@ Func_12c2df:
 	pop af
 	ret
 
-Func_12c345:
-	ld a, [wd983]
+DecrementSpriteAnimStartDelay:
+	ld a, [wCurSpriteAnimStartDelay]
 	and a
 	ret z
 	dec a
-	ld [wd983], a
+	ld [wCurSpriteAnimStartDelay], a
 	ret
 
-Func_12c34f:
-	ld a, [wd97e]
+DecrementSpriteAnimFrameDuration:
+	ld a, [wCurSpriteAnimFrameDuration]
 	dec a
-	ld [wd97e], a
+	ld [wCurSpriteAnimFrameDuration], a
 	and a
 	ret nz
 	call Func_12c36a
 	ret
 
 Func_12c35c:
-	ld a, [wd97b]
+	ld a, [wCurSpriteAnimFrameIndex]
 	ld b, a
-	ld a, [wd97e]
+	ld a, [wCurSpriteAnimFrameDuration]
 	or b
 	ret nz
-	ld a, $ff
-	ld [wd97b], a
+	ld a, -1
+	ld [wCurSpriteAnimFrameIndex], a
 Func_12c36a:
-	ld a, [wd97b]
+	ld a, [wCurSpriteAnimFrameIndex]
 	inc a
-	ld [wd97b], a
-.asm_12c371
-	ld a, [wd97c]
+	ld [wCurSpriteAnimFrameIndex], a
+.reset
+	ld a, [wCurSpriteAnimFramesetID + 0]
 	ld c, a
-	ld a, [wd97d]
+	ld a, [wCurSpriteAnimFramesetID + 1]
 	ld b, a
-	call Func_12c084
-	ld a, [wd97b]
+	call GetFramesetPointer
+	ld a, [wCurSpriteAnimFrameIndex]
 	ld c, a
-	call Func_3992
+	call GetFramesetData
 	ld a, b
 	and a
-	jr nz, .asm_12c38d
+	jr nz, .non_zero_duration
 	xor a
-	ld [wd97b], a
-	jr .asm_12c371
-.asm_12c38d
+	ld [wCurSpriteAnimFrameIndex], a
+	jr .reset
+.non_zero_duration
 	cp $ff
-	jr nz, .asm_12c396
-	ld hl, wd976
-	res 4, [hl]
-.asm_12c396
-	ld a, [wd977]
+	jr nz, .continue
+	; end of animation
+	ld hl, wCurSpriteAnim
+	res SPRITEANIMSTRUCT_ANIMATING_F, [hl] ; SPRITEANIMSTRUCT_FLAGS
+.continue
+	ld a, [wCurSpriteAnimUnk1]
 	bit 2, a
-	jr z, .asm_12c39f
+	jr z, .apply_position_offset
 	srl b
-.asm_12c39f
+.apply_position_offset
 	ld a, b
-	ld [wd97e], a
+	ld [wCurSpriteAnimFrameDuration], a
 	ld a, c
 	ld [wd975], a
 	ld a, d
 	ld [wd971], a
 	ld a, e
 	ld [wd972], a
+
 	ld a, [wd971]
 	ld b, a
-	ld a, [wd979]
+	ld a, [wCurSpriteAnimXPos]
 	add b
-	ld [wd979], a
+	ld [wCurSpriteAnimXPos], a
 	ld a, [wd972]
 	ld b, a
-	ld a, [wd97a]
+	ld a, [wCurSpriteAnimYPos]
 	add b
-	ld [wd97a], a
+	ld [wCurSpriteAnimYPos], a
 	ret
 
-Func_12c3c6:
-	ld de, wd976
-	ld bc, $e
+; load sprite anim in hl to wCurSpriteAnim
+LoadSpriteAnim:
+	ld de, wCurSpriteAnim
+	ld bc, (SPRITEANIMSTRUCT_START_DELAY - SPRITEANIMSTRUCT_FLAGS) + 1
 	call CopyDataHLtoDE_SaveRegisters
 	ret
 
-Func_12c3d0:
+; write wCurSpriteAnim to sprite anim in hl
+WriteCurSpriteAnim:
 	ld d, h
 	ld e, l
-	ld hl, wd976
-	ld bc, $e
+	ld hl, wCurSpriteAnim
+	ld bc, (SPRITEANIMSTRUCT_START_DELAY - SPRITEANIMSTRUCT_FLAGS) + 1
 	call CopyDataHLtoDE_SaveRegisters
 	ret
 
 SECTION "Bank 4B@7355", ROMX[$7355], BANK[$4b]
 
 Data_12f355:
-	dw $147, $147, $147, $147 ; $00
-	dw $148, $148, $148, $148 ; $01
-	dw $149, $149, $149, $149 ; $02
-	dw $14a, $14a, $14a, $14a ; $03
-	dw $14b, $14b, $14b, $14b ; $04
-	dw $14c, $14c, $14c, $14c ; $05
-	dw $14d, $14d, $14d, $14d ; $06
-	dw $14e, $14e, $14e, $14e ; $07
-	dw $14f, $14f, $14f, $14f ; $08
-	dw $150, $150, $150, $150 ; $09
-	dw $151, $151, $151, $151 ; $0a
-	dw $152, $152, $152, $152 ; $0b
-	dw $153, $153, $153, $153 ; $0c
-	dw $155, $155, $155, $155 ; $0d
-	dw $0aa, $0ab, $0ac, $0ad ; $0e
-	dw $0b0, $0b1, $0b2, $0b3 ; $0f
-	dw $0b6, $0b7, $0b8, $0b9 ; $10
-	dw $0ba, $0bb, $0bc, $0bd ; $11
-	dw $0be, $0be, $0be, $0be ; $12
-	dw $0bf, $0c0, $0c1, $0c2 ; $13
-	dw $0c3, $0c4, $0c5, $0c6 ; $14
-	dw $0c7, $0c8, $0c9, $0ca ; $15
-	dw $0cb, $0cc, $0cd, $0ce ; $16
-	dw $0cf, $0d0, $0d1, $0d2 ; $17
-	dw $0d3, $0d4, $0d5, $0d6 ; $18
-	dw $0d7, $0d8, $0d9, $0da ; $19
-	dw $0db, $0dc, $0dd, $0de ; $1a
-	dw $0df, $0e0, $0e1, $0e2 ; $1b
-	dw $0e3, $0e4, $0e5, $0e6 ; $1c
-	dw $0e7, $0e8, $0e9, $0ea ; $1d
-	dw $0eb, $0ec, $0ed, $0ee ; $1e
-	dw $0ef, $0f0, $0f1, $0f2 ; $1f
-	dw $0f3, $0f4, $0f5, $0f6 ; $20
-	dw $0f7, $0f8, $0f9, $0fa ; $21
-	dw $0fb, $0fc, $0fd, $0fe ; $22
-	dw $0ff, $100, $101, $102 ; $23
-	dw $103, $104, $105, $106 ; $24
-	dw $107, $108, $109, $10a ; $25
-	dw $10b, $10b, $10b, $10b ; $26
-	dw $10c, $10c, $10c, $10c ; $27
-	dw $10d, $10d, $10d, $10d ; $28
-	dw $10e, $10e, $10e, $10e ; $29
-	dw $10f, $110, $110, $10f ; $2a
-	dw $111, $111, $111, $111 ; $2b
-	dw $08a, $08b, $08c, $08d ; $2c
-	dw $08e, $08f, $090, $091 ; $2d
-	dw $092, $093, $094, $095 ; $2e
-	dw $096, $097, $098, $099 ; $2f
-	dw $09a, $09b, $09c, $09d ; $30
-	dw $09e, $09f, $0a0, $0a1 ; $31
-	dw $0a2, $0a3, $0a4, $0a5 ; $32
-	dw $0a6, $0a7, $0a8, $0a9 ; $33
+	dw FRAMESET_147, FRAMESET_147, FRAMESET_147, FRAMESET_147 ; $00
+	dw FRAMESET_148, FRAMESET_148, FRAMESET_148, FRAMESET_148 ; $01
+	dw FRAMESET_149, FRAMESET_149, FRAMESET_149, FRAMESET_149 ; $02
+	dw FRAMESET_14A, FRAMESET_14A, FRAMESET_14A, FRAMESET_14A ; $03
+	dw FRAMESET_14B, FRAMESET_14B, FRAMESET_14B, FRAMESET_14B ; $04
+	dw FRAMESET_14C, FRAMESET_14C, FRAMESET_14C, FRAMESET_14C ; $05
+	dw FRAMESET_14D, FRAMESET_14D, FRAMESET_14D, FRAMESET_14D ; $06
+	dw FRAMESET_14E, FRAMESET_14E, FRAMESET_14E, FRAMESET_14E ; $07
+	dw FRAMESET_14F, FRAMESET_14F, FRAMESET_14F, FRAMESET_14F ; $08
+	dw FRAMESET_150, FRAMESET_150, FRAMESET_150, FRAMESET_150 ; $09
+	dw FRAMESET_151, FRAMESET_151, FRAMESET_151, FRAMESET_151 ; $0a
+	dw FRAMESET_152, FRAMESET_152, FRAMESET_152, FRAMESET_152 ; $0b
+	dw FRAMESET_153, FRAMESET_153, FRAMESET_153, FRAMESET_153 ; $0c
+	dw FRAMESET_155, FRAMESET_155, FRAMESET_155, FRAMESET_155 ; $0d
+	dw FRAMESET_0AA, FRAMESET_0AB, FRAMESET_0AC, FRAMESET_0AD ; $0e
+	dw FRAMESET_0B0, FRAMESET_0B1, FRAMESET_0B2, FRAMESET_0B3 ; $0f
+	dw FRAMESET_0B6, FRAMESET_0B7, FRAMESET_0B8, FRAMESET_0B9 ; $10
+	dw FRAMESET_0BA, FRAMESET_0BB, FRAMESET_0BC, FRAMESET_0BD ; $11
+	dw FRAMESET_0BE, FRAMESET_0BE, FRAMESET_0BE, FRAMESET_0BE ; $12
+	dw FRAMESET_0BF, FRAMESET_0C0, FRAMESET_0C1, FRAMESET_0C2 ; $13
+	dw FRAMESET_0C3, FRAMESET_0C4, FRAMESET_0C5, FRAMESET_0C6 ; $14
+	dw FRAMESET_0C7, FRAMESET_0C8, FRAMESET_0C9, FRAMESET_0CA ; $15
+	dw FRAMESET_0CB, FRAMESET_0CC, FRAMESET_0CD, FRAMESET_0CE ; $16
+	dw FRAMESET_0CF, FRAMESET_0D0, FRAMESET_0D1, FRAMESET_0D2 ; $17
+	dw FRAMESET_0D3, FRAMESET_0D4, FRAMESET_0D5, FRAMESET_0D6 ; $18
+	dw FRAMESET_0D7, FRAMESET_0D8, FRAMESET_0D9, FRAMESET_0DA ; $19
+	dw FRAMESET_0DB, FRAMESET_0DC, FRAMESET_0DD, FRAMESET_0DE ; $1a
+	dw FRAMESET_0DF, FRAMESET_0E0, FRAMESET_0E1, FRAMESET_0E2 ; $1b
+	dw FRAMESET_0E3, FRAMESET_0E4, FRAMESET_0E5, FRAMESET_0E6 ; $1c
+	dw FRAMESET_0E7, FRAMESET_0E8, FRAMESET_0E9, FRAMESET_0EA ; $1d
+	dw FRAMESET_0EB, FRAMESET_0EC, FRAMESET_0ED, FRAMESET_0EE ; $1e
+	dw FRAMESET_0EF, FRAMESET_0F0, FRAMESET_0F1, FRAMESET_0F2 ; $1f
+	dw FRAMESET_0F3, FRAMESET_0F4, FRAMESET_0F5, FRAMESET_0F6 ; $20
+	dw FRAMESET_0F7, FRAMESET_0F8, FRAMESET_0F9, FRAMESET_0FA ; $21
+	dw FRAMESET_0FB, FRAMESET_0FC, FRAMESET_0FD, FRAMESET_0FE ; $22
+	dw FRAMESET_0FF, FRAMESET_100, FRAMESET_101, FRAMESET_102 ; $23
+	dw FRAMESET_103, FRAMESET_104, FRAMESET_105, FRAMESET_106 ; $24
+	dw FRAMESET_107, FRAMESET_108, FRAMESET_109, FRAMESET_10A ; $25
+	dw FRAMESET_10B, FRAMESET_10B, FRAMESET_10B, FRAMESET_10B ; $26
+	dw FRAMESET_10C, FRAMESET_10C, FRAMESET_10C, FRAMESET_10C ; $27
+	dw FRAMESET_10D, FRAMESET_10D, FRAMESET_10D, FRAMESET_10D ; $28
+	dw FRAMESET_10E, FRAMESET_10E, FRAMESET_10E, FRAMESET_10E ; $29
+	dw FRAMESET_10F, FRAMESET_110, FRAMESET_110, FRAMESET_10F ; $2a
+	dw FRAMESET_111, FRAMESET_111, FRAMESET_111, FRAMESET_111 ; $2b
+	dw FRAMESET_08A, FRAMESET_08B, FRAMESET_08C, FRAMESET_08D ; $2c
+	dw FRAMESET_08E, FRAMESET_08F, FRAMESET_090, FRAMESET_091 ; $2d
+	dw FRAMESET_092, FRAMESET_093, FRAMESET_094, FRAMESET_095 ; $2e
+	dw FRAMESET_096, FRAMESET_097, FRAMESET_098, FRAMESET_099 ; $2f
+	dw FRAMESET_09A, FRAMESET_09B, FRAMESET_09C, FRAMESET_09D ; $30
+	dw FRAMESET_09E, FRAMESET_09F, FRAMESET_0A0, FRAMESET_0A1 ; $31
+	dw FRAMESET_0A2, FRAMESET_0A3, FRAMESET_0A4, FRAMESET_0A5 ; $32
+	dw FRAMESET_0A6, FRAMESET_0A7, FRAMESET_0A8, FRAMESET_0A9 ; $33

src/engine/duel/core.asm

@@ -1,47 +0,0 @@
-SECTION "Duel Core@563e", ROMX[$563e], BANK[$1]
-
-ZeroObjectPositionsAndToggleOAMCopy:
-	call ZeroObjectPositions
-	ld a, $01
-	ld [wVBlankOAMCopyToggle], a
-	ret
-
-SECTION "Duel Core@6bc8", ROMX[$6bc8], BANK[$1]
-
-SetDefaultPalettes:
-	call SetFontAndTextBoxFrameColor
-	ld a, %11100100
-	ld [wOBP0], a
-	ld [wBGP], a
-	ld a, $01 ; equivalent to FLUSH_ONE_PAL
-	ldh [hFlushPaletteFlags], a
-	ld hl, Pals_6f0b0 - $4000
-	ld de, wcb2e
-	ld c, CGB_PAL_SIZE
-	call CopyFontsOrDuelGraphicsBytes
-	call FlushAllPalettes
-	ret
-
-SetFontAndTextBoxFrameColor:
-	ld a, $01
-	ld [wTextBoxFrameType], a
-	ld hl, Pals_6f0b0 - $4000
-	ld de, wBackgroundPalettesCGB
-	ld c, CGB_PAL_SIZE
-	call CopyFontsOrDuelGraphicsBytes
-	push de
-	call EnableSRAM
-	ld a, [sTextBoxFrameColor]
-	call DisableSRAM
-	inc a
-	add a
-	add a
-	add a ; *CGB_PAL_SIZE
-	ld e, a
-	ld d, $00
-	ld hl, Pals_6f0b0 - $4000
-	add hl, de
-	pop de
-	ld c, CGB_PAL_SIZE
-	call CopyFontsOrDuelGraphicsBytes
-	ret

src/engine/game_loop.asm

@@ -5,10 +5,10 @@ GameLoop::
 	call EnableInt_VBlank
 	call EnableInt_Timer
 	call EnableSRAM
-	ld a, [$a006] ; sTextSpeed
-	ld [$cdde], a ; wTextSpeed
-	ld a, [$a009] ; sSkipDelayAllowed
-	ld [$cd08], a ; wSkipDelayAllowed
+	ld a, [sTextSpeed]
+	ld [wTextSpeed], a
+	ld a, [s0a009]
+	ld [wcd08], a
 	call DisableSRAM
 	ld a, DECK_SIZE
 	ld [wDeckSize], a

src/engine/scenes.asm

@@ -17,7 +17,7 @@ _LoadScene::
 	ld h, [hl]
 	ld l, a
 	ld c, $02
-	call Func_3d61
+	call LoadBGGraphics
 	ld a, d
 	add a
 	add a
@@ -45,8 +45,8 @@ _LoadScene::
 	ld e, a
 	ld b, BANK(SceneDataPointers)
 	ld a, $ff
-	ld c, $00
-	call Func_3dcf
+	ld c, 0
+	call CreateSpriteAnim
 	pop de
 	jr .loop
 .done
@@ -67,10 +67,10 @@ SceneDataPointers:
 	dw .Scene07 ; SCENE_07
 	dw .Scene08 ; SCENE_08
 	dw .Scene09 ; SCENE_09
-	dw .Scene0a ; SCENE_0A
-	dw .Scene0b ; SCENE_0B
-	dw .Scene0c ; SCENE_0C
-	dw .Scene0d ; SCENE_0D
+	dw .SceneIntroBaseSet ; SCENE_INTRO_BASE_SET
+	dw .SceneIntroJungle ; SCENE_INTRO_JUNGLE
+	dw .SceneIntroFossil ; SCENE_INTRO_FOSSIL
+	dw .SceneIntroTeamRocket ; SCENE_INTRO_TEAM_ROCKET
 	dw .Scene0e ; SCENE_0E
 	dw .Scene0f ; SCENE_0F
 	dw .Scene10 ; SCENE_10
@@ -203,26 +203,26 @@ SceneDataPointers:
 	dw PALETTE_160
 	db $ff, $ff ; end
 
-.Scene0a
-	dw TILESET_1C8
+.SceneIntroBaseSet
+	dw TILESET_INTRO_BASE_SET
 	dw PALETTE_15C
 	dw TILEMAP_21A
 	db $ff, $ff ; end
 
-.Scene0b
-	dw TILESET_1C9
+.SceneIntroJungle
+	dw TILESET_INTRO_JUNGLE
 	dw PALETTE_15D
 	dw TILEMAP_21B
 	db $ff, $ff ; end
 
-.Scene0c
-	dw TILESET_1CA
+.SceneIntroFossil
+	dw TILESET_INTRO_FOSSIL
 	dw PALETTE_15E
 	dw TILEMAP_21C
 	db $ff, $ff ; end
 
-.Scene0d
-	dw TILESET_1CB
+.SceneIntroTeamRocket
+	dw TILESET_INTRO_TEAM_ROCKET
 	dw PALETTE_15F
 	dw TILEMAP_21D
 	db $ff, $ff ; end
@@ -330,25 +330,25 @@ SceneDataPointers:
 	db $ff, $ff ; end
 
 .Scene16
-	dw TILESET_1CD
+	dw TILESET_TITLE_SCREEN
 	dw PALETTE_167
 	dw TILEMAP_21E
 	db $ff, $ff ; end
 
 .Scene17
-	dw TILESET_1CD
+	dw TILESET_TITLE_SCREEN
 	dw PALETTE_167
 	dw TILEMAP_21F
 	db $ff, $ff ; end
 
 .Scene18
-	dw TILESET_1CD
+	dw TILESET_TITLE_SCREEN
 	dw PALETTE_167
 	dw TILEMAP_220
 	db $ff, $ff ; end
 
 .Scene19
-	dw TILESET_1CD
+	dw TILESET_TITLE_SCREEN
 	dw PALETTE_167
 	dw TILEMAP_221
 	db $ff, $ff ; end

src/gfx.asm

@@ -71,6 +71,27 @@ SECTION "Card Gfx 1", ROMX
 
 CardGraphics::
 
+SECTION "Tilemaps 1", ROMX[$74f5], BANK[$4b]
+INCLUDE "src/data/maps/tilemaps1.asm"
+
+SECTION "Tilemaps 2", ROMX
+INCLUDE "src/data/maps/tilemaps2.asm"
+
+Frameset081::
+	oamframe  0,  1,   0,   0
+	oamreset
+
+SECTION "Tilemaps 3", ROMX
+INCLUDE "src/data/maps/tilemaps3.asm"
+
+SECTION "Tilemaps 4", ROMX
+INCLUDE "src/data/maps/tilemaps4.asm"
+
+SECTION "Tilemaps 5", ROMX
+INCLUDE "src/data/maps/tilemaps5.asm"
+
+SECTION "Tilemaps 6", ROMX
+INCLUDE "src/data/maps/tilemaps6.asm"
 
 SECTION "Tilesets 1", ROMX
 
@@ -152,6 +173,10 @@ Tileset143::
 	dw 4 ; length
 	INCBIN "gfx/overworld_sprites/tileset143.2bpp"
 
+Frameset085::
+	oamframe  0,  1,   0,   0
+	oamreset
+
 SECTION "Tilesets 3", ROMX
 
 Tileset00A::
@@ -402,6 +427,10 @@ Tileset1E9::
 	dw 1 ; length
 	INCBIN "gfx/tilesets/tileset1E9.2bpp"
 
+Frameset086::
+	oamframe  4,  1,   0,   0
+	oamreset
+
 SECTION "Tilesets 8", ROMX
 
 Tileset033::
@@ -452,6 +481,10 @@ Tileset156::
 	dw 3 ; length
 	INCBIN "gfx/tilesets/tileset156.2bpp"
 
+Frameset0BE::
+	oamframe  0, 16,   0,   0
+	oamreset
+
 SECTION "Tilesets 9", ROMX
 
 Tileset03C::
@@ -502,6 +535,10 @@ Tileset17D::
 	dw 2 ; length
 	INCBIN "gfx/tilesets/tileset17D.2bpp"
 
+Frameset103::
+	oamframe  0,  1,   0,   0
+	oamreset
+
 SECTION "Tilesets 10", ROMX
 
 Tileset047::
@@ -552,6 +589,10 @@ Tileset056::
 	dw 56 ; length
 	INCBIN "gfx/tilesets/tileset056.2bpp"
 
+Frameset104::
+	oamframe  1,  1,   0,   0
+	oamreset
+
 SECTION "Tilesets 11", ROMX
 
 Tileset052::
@@ -788,6 +829,10 @@ Tileset158::
 	dw 7 ; length
 	INCBIN "gfx/tilesets/tileset158.2bpp"
 
+Frameset105::
+	oamframe  2,  1,   0,   0
+	oamreset
+
 SECTION "Tilesets 15", ROMX
 
 Tileset088::
@@ -1018,6 +1063,10 @@ Tileset14F::
 	dw 10 ; length
 	INCBIN "gfx/tilesets/tileset14F.2bpp"
 
+Frameset106::
+	oamframe  3,  1,   0,   0
+	oamreset
+
 SECTION "Tilesets 19", ROMX
 
 Tileset0AC::
@@ -1131,6 +1180,10 @@ Tileset17F::
 	dw 3 ; length
 	INCBIN "gfx/tilesets/tileset17F.2bpp"
 
+Frameset107::
+	oamframe  0,  1,   0,   0
+	oamreset
+
 SECTION "Tilesets 21", ROMX
 
 Tileset0BE::
@@ -1181,6 +1234,10 @@ Tileset182::
 	dw 3 ; length
 	INCBIN "gfx/tilesets/tileset182.2bpp"
 
+Frameset108::
+	oamframe  1,  1,   0,   0
+	oamreset
+
 SECTION "Tilesets 22", ROMX
 
 Tileset0C7::
@@ -1231,6 +1288,10 @@ Tileset15D::
 	dw 10 ; length
 	INCBIN "gfx/tilesets/tileset15D.2bpp"
 
+Frameset109::
+	oamframe  2,  1,   0,   0
+	oamreset
+
 SECTION "Tilesets 23", ROMX
 
 Tileset0D0::
@@ -2168,25 +2229,25 @@ Tileset1C7::
 	dw 86 ; length
 	INCBIN "gfx/scenes/tileset1C7.2bpp"
 
-Tileset1C8::
+IntroBaseSetGfx::
 	dw 96 ; length
-	INCBIN "gfx/scenes/tileset1C8.2bpp"
+	INCBIN "gfx/scenes/intro_base_set.2bpp"
 
-Tileset1C9::
+IntroJungleGfx::
 	dw 96 ; length
-	INCBIN "gfx/scenes/tileset1C9.2bpp"
+	INCBIN "gfx/scenes/intro_jungle.2bpp"
 
-Tileset1CA::
+IntroFossilGfx::
 	dw 96 ; length
-	INCBIN "gfx/scenes/tileset1CA.2bpp"
+	INCBIN "gfx/scenes/intro_fossil.2bpp"
 
-Tileset1CB::
+IntroTeamRocketGfx::
 	dw 96 ; length
-	INCBIN "gfx/scenes/tileset1CB.2bpp"
+	INCBIN "gfx/scenes/intro_team_rocket.2bpp"
 
-Tileset1CD::
+TitleScreenGfx::
 	dw 188 ; length
-	INCBIN "gfx/scenes/tileset1CD.2bpp"
+	INCBIN "gfx/scenes/title_screen.2bpp"
 
 Tileset1CE::
 	dw 52 ; length
@@ -2393,5 +2454,30 @@ Tileset1EE::
 SECTION "Palettes 1", ROMX
 INCLUDE "data/palettes1.asm"
 
+Frameset10A::
+	oamframe  3,  1,   0,   0
+	oamreset
+
+SECTION "Framesets 1", ROMX
+INCLUDE "data/framesets1.asm"
+
+SECTION "Framesets 2", ROMX
+INCLUDE "data/framesets2.asm"
+
 SECTION "Palettes 2", ROMX
 INCLUDE "data/palettes2.asm"
+
+SECTION "OAM 1", ROMX
+INCLUDE "data/oam1.asm"
+
+SECTION "OAM 2", ROMX
+INCLUDE "data/oam2.asm"
+
+SECTION "OAM 3", ROMX
+INCLUDE "data/oam3.asm"
+
+SECTION "OAM 4", ROMX
+INCLUDE "data/oam4.asm"
+
+SECTION "OAM 5", ROMX
+INCLUDE "data/oam5.asm"

src/home/card_data.asm

@@ -57,7 +57,7 @@ LoadCardDataToBuffer2_FromCardID:
 	jr LoadCardDataToHL_FromCardID
 
 ; load data of card with id at de to wLoadedCard1
-LoadCardDataToBuffer1_FromCardID:
+LoadCardDataToBuffer1_FromCardID::
 	push hl
 	ld hl, wLoadedCard1
 ;	fallthrough
@@ -202,10 +202,10 @@ GetCardPointer:
 ; bc are supposed to be $30 (number of tiles of a card gfx) and TILE_SIZE respectively
 ; card_gfx_index = (<Name>CardGfx - CardGraphics) / 8  (using absolute ROM addresses)
 ; also copies the card's palette to wCardPalette
-LoadCardGfx:
+LoadCardGfx::
 	ldh a, [hBankROM]
 	push af
-	call Func_2e00
+	call LoadCardPalettes
 	call CopyGfxData
 	pop af
 	call BankswitchROM
@@ -214,7 +214,7 @@ LoadCardGfx:
 Func_2dc4:
 	ldh a, [hBankROM]
 	push af
-	call Func_2e00
+	call LoadCardPalettes
 	ld a, l
 	ld [wcde5], a
 	ld a, h
@@ -251,7 +251,7 @@ Func_2dc4:
 	call BankswitchROM
 	ret
 
-Func_2e00:
+LoadCardPalettes:
 	push bc
 	push de
 	push hl
@@ -268,7 +268,7 @@ Func_2e00:
 	res 7, h
 	set 6, h ; $4000 ≤ hl ≤ $7fff
 	ld b, $48
-	ld de, $cd7a
+	ld de, wCardPalettes
 .asm_2e1c
 	ld a, [hli]
 	ld [de], a

src/home/empty_screen.asm

@@ -6,7 +6,7 @@ EmptyScreen::
 	ld [wDuelDisplayedScreen], a
 	ret
 
-; returns v*BGMap0 + BG_MAP_WIDTH * c + b in de.
+; returns v*BGMap0 + BG_MAP_WIDTH * c + b in de and hl.
 ; used to map coordinates at bc to a BGMap0 address.
 BCCoordToBGMap0Address::
 	ld l, c

src/home/process_text.asm

@@ -289,15 +289,15 @@ Func_2325::
 	cp [hl]
 	jr nz, .asm_2345
 	ldh a, [hffa9]
-	ld h, $c8
+	ld h, HIGH(wc800)
 .asm_2337
 	ld l, a
 	ld a, [hl]
 	or a
 	jr nz, .asm_2337
-	ld h, $c9
+	ld h, HIGH(wc900)
 	ld c, [hl]
-	ld b, $c8
+	ld b, HIGH(wc800)
 	xor a
 	ld [bc], a
 	jr .asm_234a
@@ -310,15 +310,15 @@ Func_2325::
 .asm_234a
 	ldh a, [hffa9]
 	ld c, a
-	ld b, $c9
+	ld b, HIGH(wc900)
 	ld a, l
 	ldh [hffa9], a
 	ld [bc], a
-	ld h, $c8
+	ld h, HIGH(wc800)
 	ld [hl], c
-	ld h, $c6
+	ld h, HIGH(wc600)
 	ld [hl], e
-	inc h ; $c7
+	inc h ; HIGH(wc700)
 	ld [hl], d
 	ld b, l
 	xor a

src/home/serial.asm

@@ -508,7 +508,7 @@ DuelTransmissionError:
 	ld l, a
 	ld sp, hl
 	xor a
-	call $3062 ; PlaySong
+	call PlaySong
 	call ResetSerial
 	ret
 

src/home/start.asm

@@ -21,7 +21,7 @@ Start:
 	call SetupVRAM
 	call SetupRegisters
 	call SetupPalettes
-	call $305c ; SetupSound
+	call SetupSound
 	call SetupTimer
 	call ResetSerial
 	call CopyDMAFunction

src/home/unsorted.asm

@@ -1,37 +1,37 @@
-Func_305c::
-	farcall $77, $4000
+SetupSound::
+	farcall _SetupSound
 	ret
 
-Func_3061::
-	xor a
-Func_3062::
-	farcall $77, $4006
+StopMusic::
+	xor a ; MUSIC_STOP
+PlaySong::
+	farcall _PlaySong
 	ret
 
-Func_3067::
-	farcall $77, $400f
+AssertSongFinished::
+	farcall _AssertSongFinished
 	ret
 
 Func_306c::
-	farcall $77, $4012
+	farcall _AssertSFXFinished
 	ret
 
 Func_3071::
 	ld a, $04
-Func_3073::
-	farcall $77, $4009
+PlaySFX::
+	farcall _PlaySFX
 	ret
 
-Func_3078::
-	farcall $77, $401b
+PauseSong::
+	farcall _PauseSong
 	ret
 
-Func_307d::
-	farcall $77, $401e
+ResumeSong::
+	farcall _ResumeSong
 	ret
 
 Func_3082::
-	farcall $77, $4018
+	farcall Music1_f4018
 	ret
 
 Func_3087::
@@ -122,7 +122,7 @@ Func_30ef::
 	ld [wd587], a
 	farcall Func_ea30
 	ld a, $56
-	call Func_3073
+	call PlaySFX
 	farcall $11, $499e
 .asm_312e
 	farcall $f, $4000
@@ -470,7 +470,7 @@ Func_3332::
 Func_3336::
 .asm_3336
 	call DoFrame
-	farcall $7, $493c
+	farcall Func_1c93c
 	jr nz, .asm_3336
 	ret
 
@@ -522,12 +522,12 @@ Func_337f::
 
 Func_338f::
 	push af
-	farcall $7, $4990
+	farcall SaveTargetFadePals
 	farcall $4, $509f
 	call DoFrame
 	pop af
 	ld b, $00
-	farcall $7, $4909
+	farcall StartPalFadeFromBlackOrWhite
 	ret
 
 Func_33a3::
@@ -718,11 +718,11 @@ Func_34be::
 	farcall $4, $4000
 	ret
 
-Func_34c3::
-.asm_34c3
+WaitForLCDOff::
+.loop_wait
 	ldh a, [rSTAT]
-	and $03
-	jr nz, .asm_34c3
+	and STAT_LCDC_STATUS
+	jr nz, .loop_wait
 	ret
 
 Func_34ca::
@@ -777,43 +777,43 @@ Func_34e5::
 	jr nz, .asm_34f3
 	ret
 
-Func_3502::
+WriteBCBytesToHL::
 	push af
 	ld a, c
 	or b
-	jr nz, .asm_3509
+	jr nz, .write
 	pop af
 	ret
-.asm_3509
+.write
 	pop af
 	inc b
-.asm_350b
+.loop
 	ld [hli], a
 	dec c
-	jr nz, .asm_350b
+	jr nz, .loop
 	dec b
-	jr nz, .asm_350b
+	jr nz, .loop
 	ret
 
-Func_3513::
+CopyBCBytesFromHLToDE::
 	ld a, c
 	or b
-	jr nz, .asm_3518
+	jr nz, .copy
 	ret
-.asm_3518
+.copy
 	inc b
-.asm_3519
+.loop
 	ld a, [hli]
 	ld [de], a
 	inc de
 	dec c
-	jr nz, .asm_3519
+	jr nz, .loop
 	dec b
-	jr nz, .asm_3519
+	jr nz, .loop
 	ret
 
 Func_3523::
-	ld [$ce4d], a
+	ld [wce4d], a
 	ldh [rSVBK], a
 	ret
 
@@ -831,22 +831,22 @@ Func_3529::
 
 Func_3535::
 	ld c, a
-.asm_3536
+.loop_entries
 	ld a, [hli]
 	cp $ff
-	jr z, .asm_355a
+	jr z, .set_carry
 	cp c
-	jr nz, .asm_3555
+	jr nz, .next
 	ldh a, [hBankROM]
 	push af
-	call .asm_354b
+	call .CallFunc
 	pop af
 	call BankswitchROM
 	scf
 	ccf
 	ret
 
-.asm_354b
+.CallFunc
 	ld a, [hli]
 	push af
 	ld a, [hli]
@@ -855,12 +855,14 @@ Func_3535::
 	pop af
 	call BankswitchROM
 	jp hl
-.asm_3555
+
+.next
 	inc hl
 	inc hl
 	inc hl
-	jr .asm_3536
-.asm_355a
+	jr .loop_entries
+
+.set_carry
 	scf
 	ret
 
@@ -992,6 +994,8 @@ Func_35df::
 	pop bc
 	ret
 
+; hl = source
+; de = destination
 ; a = VRAM bank
 ; c = number of tiles
 ; if c is $00, copy $100 tiles
@@ -1017,6 +1021,7 @@ CopyTiles::
 	pop af
 	ret
 
+; hl = source
 ; a = VRAM bank
 ; b = tile number in Tiles1
 ; c = number of tiles
@@ -1046,6 +1051,7 @@ CopyTilesToTiles1::
 	pop af
 	ret
 
+; hl = source
 ; a = VRAM bank
 ; b = tile number in Tiles0
 ; c = number of tiles
@@ -1365,7 +1371,7 @@ Func_37ce::
 	ld b, a
 	or c
 	jr z, .asm_3823
-	farcall $7, $493c
+	farcall Func_1c93c
 	jr nz, .asm_3823
 	farcall $7, $4941
 	cp $02
@@ -1495,7 +1501,7 @@ Func_3861::
 	ldh [rBGP], a
 	ret
 
-Func_389d::
+DrawRegularTextBoxVRAM0::
 	push af
 	push bc
 	push de
@@ -1523,7 +1529,7 @@ Func_38ad::
 	pop af
 	ret
 
-Func_38bd::
+LoadGfxPalettes::
 	ldh a, [hBankROM]
 	push af
 	ld a, b
@@ -1532,8 +1538,8 @@ Func_38bd::
 	ld b, $00
 	sla c
 	sla c
-	sla c
-	ld hl, wcb2e
+	sla c ; *CGB_PAL_SIZE
+	ld hl, wObjectPalettesCGB
 	add hl, bc
 	ld d, h
 	ld e, l
@@ -1556,11 +1562,11 @@ Func_38bd::
 	call BankswitchROM
 	ret
 
-Func_38e8::
+LoadGfxFromTileset::
 	push bc
 	push de
 	push hl
-	ld a, [wd942]
+	ld a, [wCurVRAMTile]
 	push af
 	ldh a, [hBankROM]
 	push af
@@ -1568,15 +1574,15 @@ Func_38e8::
 	call BankswitchROM
 	ld a, [hli]
 	ld c, a
-	ld a, [hli]
-	ld a, [wd942]
+	ld a, [hli] ; unused
+	ld a, [wCurVRAMTile]
 	ld e, a
-.asm_38fd
+.loop_tiles
 	push bc
 	ld a, e
 	and $7f
 	ld b, a
-	ld c, $01
+	ld c, 1 ; number of tiles
 	ld a, e
 	and $80
 	swap a
@@ -1587,9 +1593,9 @@ Func_38e8::
 	pop bc
 	inc e
 	dec c
-	jr nz, .asm_38fd
+	jr nz, .loop_tiles
 	ld a, e
-	ld [wd942], a
+	ld [wCurVRAMTile], a
 	pop af
 	call BankswitchROM
 	pop af
@@ -1599,8 +1605,11 @@ Func_38e8::
 	ret
 
 ; input:
-; a = ?
 ; b:hl = sprite animation pointer
+; a = tile offset in VRAM
+; c = frame number
+; d = x position
+; e = y position
 Func_3924::
 	push af
 	push bc
@@ -1641,6 +1650,7 @@ Func_3924::
 	ld a, e
 	sub c
 	ld e, a
+
 	ld a, [hli] ; x
 	add d
 	ld d, a
@@ -1657,9 +1667,11 @@ Func_3924::
 	ld a, d
 	sub c
 	ld d, a
-	ld a, [hli]
+
+	ld a, [hli] ; tile index
 	add b
 	ld c, a
+
 	ld a, [wd96f]
 	ld b, a
 	ld a, [hli] ; attributes
@@ -1667,10 +1679,10 @@ Func_3924::
 	ld b, a
 	ld a, c
 	bit 7, a
-	jr z, .asm_3981
+	jr z, .set_attr
 	set OAM_TILE_BANK, b
 	res 7, c
-.asm_3981
+.set_attr
 	call SetOneObjectAttributes
 	pop de
 	pop bc
@@ -1684,7 +1696,7 @@ Func_3924::
 	pop af
 	ret
 
-Func_3992::
+GetFramesetData::
 	push hl
 	ldh a, [hBankROM]
 	push af
@@ -1695,7 +1707,7 @@ Func_3992::
 	sla c
 	rl b
 	sla c
-	rl b
+	rl b ; *4
 	add hl, bc
 	pop bc
 	ld c, [hl]
@@ -1726,43 +1738,45 @@ Func_3992::
 	pop hl
 	ret
 
-Func_39cc::
+; hl = list of text IDs
+PrintScrollableTextFromList::
 	push af
 	push hl
-.asm_39ce
+.loop_text_ids
 	ld a, [hl]
 	cp $ff
-	jr z, .asm_39e0
+	jr z, .done
 	push hl
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	farcall $4, $502c
+	farcall PrintScrollableText_NoTextBoxLabelVRAM0
 	pop hl
 	inc hl
 	inc hl
-	jr .asm_39ce
-.asm_39e0
+	jr .loop_text_ids
+.done
 	pop hl
 	pop af
 	ret
 
-Func_39e3::
+ResetFrameFunctionStack::
 	xor a
-	ld [$d9bd], a
+	ld [wFrameFunctionStackSize], a
 	ret
 
-Func_39e8::
+; hl = new frame function
+PushFrameFunction::
 	push af
 	push bc
 	push hl
-	ld hl, $d9bd
+	ld hl, wFrameFunctionStackSize
 	ld a, [hl]
 	inc [hl]
 	add a
 	ld c, a
 	ld b, $00
-	ld hl, $d9be
+	ld hl, wFrameFunctionStack
 	add hl, bc
 	ld a, [wDoFrameFunction + 0]
 	ld [hli], a
@@ -1779,17 +1793,17 @@ Func_39e8::
 	pop af
 	ret
 
-Func_3a0e::
+PopFrameFunction::
 	push af
 	push bc
 	push hl
-	ld hl, $d9bd
+	ld hl, wFrameFunctionStackSize
 	dec [hl]
 	ld a, [hl]
 	add a
 	ld c, a
 	ld b, $00
-	ld hl, $d9be
+	ld hl, wFrameFunctionStack
 	add hl, bc
 	di
 	ld a, [hli]
@@ -1802,12 +1816,12 @@ Func_3a0e::
 	pop af
 	ret
 
-Func_3a2c::
+FrameFunc_FadePals::
 	push af
 	push bc
 	push de
 	push hl
-	farcall $7, $46c2
+	farcall FadePalettes
 	pop hl
 	pop de
 	pop bc
@@ -1831,24 +1845,24 @@ Func_3a39::
 	farcall $4, $4ea3
 .asm_3a56
 	farcall $7, $757b
-	farcall Func_109fa
+	farcall UpdateSpriteAnims
 	call Func_3698
 	call Func_37ce
-	farcall $7, $46c2
+	farcall FadePalettes
 	pop hl
 	pop de
 	pop bc
 	pop af
 	ret
 
-Func_3a6d::
+FrameFunc_SpriteAnimationAndFadePals::
 	push af
 	push bc
 	push de
 	push hl
 	call Func_3f78
-	farcall Func_109fa
-	farcall $7, $46c2
+	farcall UpdateSpriteAnims
+	farcall FadePalettes
 	pop hl
 	pop de
 	pop bc
@@ -1864,7 +1878,7 @@ Func_3a81::
 	ld a, [$dcea]
 	cp $ff
 	jr nz, .asm_3a94
-	farcall Func_109fa
+	farcall UpdateSpriteAnims
 .asm_3a94
 	pop hl
 	pop de
@@ -2271,33 +2285,34 @@ Func_3cc3::
 
 Func_3cdd::
 	xor a
-	ld [$dd04], a
-	ld [$dd05], a
+	ld [wdd04], a
+	ld [wdd05], a
 	ret
 
-Func_3ce5::
+; a = MUSIC_* constant
+SetMusic::
 	push bc
 	push hl
-	ld hl, $dd04
+	ld hl, wdd04
 	ld b, [hl]
 	cp b
-	jr z, .asm_3cf4
-	ld [$dd04], a
-	call Func_3062
-.asm_3cf4
+	jr z, .skip
+	ld [wdd04], a
+	call PlaySong
+.skip
 	pop hl
 	pop bc
 	ret
 
-Func_3cf7::
+SetNoMusic::
 	push af
 	xor a
-	call Func_3ce5
+	call SetMusic
 	pop af
 	ret
 
 Func_3cfe::
-	call Func_3073
+	call PlaySFX
 	ret
 
 Func_3d02::
@@ -2308,39 +2323,39 @@ Func_3d02::
 	ret
 
 Func_3d09::
-	call Func_3062
+	call PlaySong
 	ret
 
 Func_3d0d::
 	push af
 	call Func_3d1f
-	call Func_3078
+	call PauseSong
 	pop af
 	ret
 
 Func_3d16::
 	push af
 	call Func_3d32
-	call Func_307d
+	call ResumeSong
 	pop af
 	ret
 
 Func_3d1f::
 	push bc
-	ld a, [$dd05]
+	ld a, [wdd05]
 	ld b, a
-	ld a, [$dd06]
+	ld a, [wdd06]
 	or b
-	ld [$dd06], a
+	ld [wdd06], a
 	ld a, $ff
-	ld [$dd05], a
+	ld [wdd05], a
 	pop bc
 	ret
 
 Func_3d32::
 	xor a
-	ld [$dd05], a
-	ld [$dd04], a
+	ld [wdd05], a
+	ld [wdd04], a
 	ret
 
 Func_3d3a::
@@ -2351,20 +2366,20 @@ Func_3d3e::
 	push af
 .asm_3d3f
 	call DoFrame
-	call Func_3067
+	call AssertSongFinished
 	or a
 	jr nz, .asm_3d3f
 	pop af
 	ret
 
 Func_3d4a::
-	ld a, [$dd06]
+	ld a, [wdd06]
 	and a
 	ret
 
 Func_3d4f::
 	xor a
-	ld [$dd06], a
+	ld [wdd06], a
 	ret
 
 Func_3d54::
@@ -2380,32 +2395,39 @@ Func_3d54::
 	ret
 
 ; c = starting CGB BG pal
-Func_3d61::
+LoadBGGraphics::
 	push af
 	push bc
 	push de
 	ld a, c
-	ld [$dd2f], a
+	ld [wdd2f], a
 	ldh a, [hBankROM]
 	push af
 	ld a, b
 	call BankswitchROM
+
+	; tileset
 	ld a, [hli]
 	ld c, a
 	ld a, [hli]
 	ld b, a
-	call Func_3d90
+	call LoadTileset
+
+	; palette
 	ld a, [hli]
 	ld c, a
 	ld a, [hli]
 	ld b, a
-	ld a, [$dd2f]
-	call Func_3db2
+	ld a, [wdd2f]
+	call LoadBGPalette
+
+	; tilemap
 	ld a, [hli]
 	ld c, a
 	ld a, [hli]
 	ld b, a
-	farcall Func_12e68
+	farcall LoadAttrmap
+
 	pop af
 	call BankswitchROM
 	pop de
@@ -2414,7 +2436,7 @@ Func_3d61::
 	ret
 
 ; bc = TILESET_* constant
-Func_3d90::
+LoadTileset::
 	push af
 	push bc
 	push de
@@ -2440,7 +2462,7 @@ Func_3d90::
 
 ; a = starting CGB BG pal
 ; bc = PALETTE_* constant
-Func_3db2::
+LoadBGPalette::
 	push af
 	push bc
 	push de
@@ -2462,10 +2484,12 @@ Func_3db2::
 	ret
 
 ; input:
-; a = ?
-; b = bank
-; c = pal index
-Func_3dcf::
+; b:hl = object gfx params
+; de = coordinates
+; a = $00 to overwrite cth object slot
+;     $ff to write on next empty object slot
+; c = object index to overwrite
+CreateSpriteAnim::
 	push af
 	push bc
 	push de
@@ -2486,30 +2510,34 @@ Func_3dcf::
 	pop bc
 	ld a, [wdd2d]
 	cp $ff
-	jr z, .asm_3dfb
-	farcall Func_10948
-	jr .asm_3dff
-.asm_3dfb
-	farcall Func_1090e
-.asm_3dff
-	farcall Func_10959
-	farcall Func_10a1e
+	jr z, .get_inactive
+	farcall GetCthSpriteAnim
+	jr .got_obj
+.get_inactive
+	farcall GetNextInactiveSpriteAnim
+.got_obj
+	farcall SetNewSpriteAnimValues
+	farcall SetSpriteAnimPosition
+
 	ld a, [wdd25 + 0]
 	ld c, a
 	ld a, [wdd25 + 1]
 	ld b, a
-	farcall Func_12c2a6
-	farcall Func_10cad
+	farcall LoadSpriteAnimGfx
+	farcall SetSpriteAnimTileOffset
+
 	ld a, [wdd27 + 0]
 	ld c, a
 	ld a, [wdd27 + 1]
 	ld b, a
-	farcall Func_10ccb
+	farcall SetSpriteAnimAnimation
+
 	ld a, [wdd29 + 0]
 	ld c, a
 	ld a, [wdd29 + 1]
 	ld b, a
-	farcall Func_10c5a
+	farcall SetAndInitSpriteAnimFrameset
+
 	ld a, [wdd2b + 0]
 	ld c, a
 	ld a, [wdd2b + 1]
@@ -2517,7 +2545,8 @@ Func_3dcf::
 	farcall GetPaletteGfxPointer
 	ld a, [wdd2e]
 	ld c, a
-	call Func_38bd
+	call LoadGfxPalettes
+
 	pop af
 	call BankswitchROM
 	pop hl
@@ -2529,17 +2558,17 @@ Func_3dcf::
 	ret
 
 Func_3e4f::
-	farcall $4, $50ac
+	farcall SetSpriteAnimationAndFadePalsFrameFunc
 	ret
 
 Func_3e54::
-	farcall $4, $50b5
+	farcall UnsetSpriteAnimationAndFadePalsFrameFunc
 	farcall $4, $4d40
 	ret
 
 Func_3e5d::
 	push af
-	farcall $4, $429d
+	farcall ClearSpriteAnimsAndSetInitialGraphicsConfiguration
 	call EmptyScreen
 	pop af
 	call LoadScene
@@ -2684,34 +2713,37 @@ Func_3f53::
 	pop hl
 	ret
 
+; clears wde69
 Func_3f61::
 	di
 	xor a
-	ld [$de69], a
-	ld [$de6a], a
+	ld [wde69 + 0], a
+	ld [wde69 + 1], a
 	ei
 	ret
 
+; sets wde69 to function in hl
 Func_3f6b::
 	di
 	push af
 	ld a, l
-	ld [$de69], a
+	ld [wde69 + 0], a
 	ld a, h
-	ld [$de6a], a
+	ld [wde69 + 1], a
 	pop af
 	ei
 	ret
 
+; jumps to wde69 if not null
 Func_3f78::
 	push af
-	ld hl, $de69
+	ld hl, wde69
 	ld a, [hli]
 	or [hl]
-	jr nz, .asm_3f82
+	jr nz, .not_null
 	pop af
 	ret
-.asm_3f82
+.not_null
 	ld a, [hld]
 	ld l, [hl]
 	ld h, a

src/layout.link

@@ -33,6 +33,7 @@ ROM0
 	"Audio Callback"
 ROMX $01
 	"Game Loop"
+	"Bank 1"
 ROMX $03
 	"Bank 3"
 	org $41c9
@@ -51,6 +52,12 @@ ROMX $03
 	"Bank 3@6883"
 	org $6b97
 	"Bank 3@6b97"
+ROMX $04
+	"Bank 4"
+ROMX $07
+	"Bank 7"
+ROMX $11
+	"Bank 11"
 ROMX $1b
 	"Gfx 1"
 	org $70b0
@@ -175,6 +182,18 @@ ROMX $77
 	"Audio 1"
 ROMX $70
 	"Palettes 2"
+	"OAM 1"
+ROMX $71
+	"OAM 2"
+ROMX $72
+	"OAM 3"
+ROMX $73
+	"OAM 4"
+ROMX $74
+	"OAM 5"
+	"Framesets 1"
+ROMX $75
+	"Framesets 2"
 ROMX $78
 	"Audio 2"
 ROMX $79
@@ -215,8 +234,16 @@ WRAMX 1
 	"WRAM1@d0bf"
 	org $d54c
 	"WRAM1@d54c"
+	org $da39
+	"WRAM1@da39"
+	org $da9d
+	"WRAM1@da9d"
+	org $dc06
+	"WRAM1@dc06"
 	org $dd02
 	"WRAM1@dd02"
+WRAMX 3
+	"WRAM3"
 WRAMX 7
 	"WRAM7 Audio"
 VRAM $00

src/macros/data.asm

@@ -12,6 +12,10 @@ MACRO dwb
 	db \2
 ENDM
 
+MACRO dba
+	dbw BANK(\1), \1
+ENDM
+
 MACRO dx
 	DEF x = 8 * ((\1) - 1)
 	REPT \1
@@ -49,10 +53,8 @@ MACRO textpointer
 	EXPORT \1_
 ENDM
 
-MACRO gfx_ptr1
-	db \1 ; BANK(\1)
-	dw \2 ; \1
-	db $0 ; padding
+MACRO tx
+	dw \1_
 ENDM
 
 MACRO gfx_ptr
@@ -60,3 +62,33 @@ MACRO gfx_ptr
 	dw \1
 	db $0
 ENDM
+
+; \1 = y offset
+; \2 = x offset
+; \3 = vtile
+; \4 = attributes
+MACRO dbsprite
+	db \1, \2, \3, \4
+ENDM
+
+; \1 = frame
+; \2 = duration
+; \3 = x offset
+; \4 = y offset
+MACRO oamframe
+	db \1, \2, \3, \4
+ENDM
+
+MACRO oamreset
+	oamframe 0, 0, 0, 0
+ENDM
+
+; \1 = duration
+MACRO oamwait
+	oamframe $ff, \1, 0, 0
+ENDM
+
+; \1 = frame
+MACRO oamend
+	oamframe \1, -1, 0, 0
+ENDM

src/macros/wram.asm

@@ -47,22 +47,6 @@ MACRO text_header
 \1RomBank::     ds 1
 ENDM
 
-MACRO sprite_anim_struct
-\1Enabled::             ds 1
-\1Attributes::          ds 1
-\1CoordX::              ds 1
-\1CoordY::              ds 1
-\1TileID::              ds 1
-\1ID::                  ds 1
-\1Bank::                ds 1
-\1Pointer::             ds 2
-\1FrameOffsetPointer::  ds 2
-\1FrameBank::           ds 1
-\1FrameDataPointer::    ds 2
-\1Counter::             ds 1
-\1Flags::               ds 1
-ENDM
-
 MACRO loaded_npc_struct
 \1ID::         ds 1
 \1Sprite::     ds 1
@@ -100,17 +84,24 @@ MACRO deck_struct
 \1Cards:: ds ((DECK_SIZE + 7) / 8 + 1) * 8
 ENDM
 
-MACRO scene_unk_struct
+MACRO sprite_anim_struct
 \1Unk0:: ds 1
 \1Unk1:: ds 1
 \1Unk2:: ds 1
-\1Unk3:: ds 2
-\1Unk5:: ds 1
-\1Unk6:: ds 2
-\1Unk8:: ds 1
-\1Unk9:: ds 1
-\1UnkA:: ds 2
+\1XPos:: ds 1
+\1YPos:: ds 1
+\1FrameIndex:: ds 1
+\1FramesetID:: ds 2
+\1FrameDuration:: ds 1
+\1TileOffset:: ds 1
+\1AnimID:: ds 2
 \1UnkC:: ds 1
-\1UnkD:: ds 1
+\1StartDelay:: ds 1
 \1UnkE:: ds 2
 ENDM
+
+MACRO obj_tile_struct
+\1ID::         ds 2 ; TILESET_* constant
+\1TileOffset:: ds 1 ; tile offset
+ds 1 ; padding
+ENDM

src/main.asm

@@ -4,19 +4,27 @@ INCLUDE "constants.asm"
 SECTION "Game Loop", ROMX
 INCLUDE "engine/game_loop.asm"
 
-INCLUDE "engine/duel/core.asm"
+SECTION "Bank 1", ROMX
+INCLUDE "engine/bank01.asm"
 
 SECTION "Bank 3", ROMX
 INCLUDE "engine/bank03.asm"
 
+SECTION "Bank 4", ROMX
 INCLUDE "engine/bank04.asm"
 
 SECTION "Scenes", ROMX[$6eb9], BANK[$4]
 INCLUDE "engine/scenes.asm"
 
+SECTION "Bank 7", ROMX
+INCLUDE "engine/bank07.asm"
+
 SECTION "GBC Only Disclaimer", ROMX[$64fd], BANK[$9]
 INCLUDE "engine/gbc_only_disclaimer.asm"
 
+SECTION "Bank 11", ROMX
+INCLUDE "engine/bank11.asm"
+
 SECTION "Decks", ROMX[$54ac], BANK[$16]
 INCLUDE "data/decks.asm"
 
@@ -27,24 +35,6 @@ INCLUDE "data/gfx_pointers/tilemaps.asm"
 INCLUDE "data/gfx_pointers/tilesets.asm"
 INCLUDE "data/gfx_pointers/palettes.asm"
 INCLUDE "data/gfx_pointers/sprite_animations.asm"
-INCLUDE "data/gfx_pointers/gfx_unknown3.asm"
+INCLUDE "data/gfx_pointers/framesets.asm"
 INCLUDE "data/gfx_pointers/gfx_unknown2.asm"
 INCLUDE "data/gfx_pointers/gfx_unknown1.asm"
-
-SECTION "Tilemaps 1", ROMX[$74f5], BANK[$4b]
-INCLUDE "src/data/maps/tilemaps1.asm"
-
-SECTION "Tilemaps 2", ROMX
-INCLUDE "src/data/maps/tilemaps2.asm"
-
-SECTION "Tilemaps 3", ROMX
-INCLUDE "src/data/maps/tilemaps3.asm"
-
-SECTION "Tilemaps 4", ROMX
-INCLUDE "src/data/maps/tilemaps4.asm"
-
-SECTION "Tilemaps 5", ROMX
-INCLUDE "src/data/maps/tilemaps5.asm"
-
-SECTION "Tilemaps 6", ROMX
-INCLUDE "src/data/maps/tilemaps6.asm"

src/sram.asm

@@ -3,7 +3,23 @@ SECTION "SRAM0", SRAM
 s0a000:: ; a000
 	ds $3
 
-	ds $9
+	ds $3
+
+sTextSpeed:: ; a006
+	ds $1
+
+s0a007:: ; a007
+	ds $1
+
+	ds $1
+
+s0a009:: ; a009
+	ds $1
+
+	ds $1
+
+s0a00b:: ; a00b
+	ds $1
 
 sTextBoxFrameColor:: ; a00c
 	ds $1
@@ -33,6 +49,9 @@ sDeck4:: deck_struct sDeck4 ; a420
 s0a4e0:: ; a4e0
 	ds $12c0
 
+sb7a0:: ; b7a0
+	ds $1
+
 SECTION "SRAM1", SRAM
 
 ; buffers used to temporary store gfx related data

src/wram.asm

@@ -241,8 +241,8 @@ wDecompSecondaryBufferPtrLow:: ; cadd
 wBackgroundPalettesCGB:: ; caee
 	ds NUM_BACKGROUND_PALETTES palettes
 
-wcb2e:: ; cb2e
-	ds 1 palettes
+wObjectPalettesCGB:: ; cb2e
+	ds NUM_OBJECT_PALETTES palettes
 
 SECTION "WRAM0 Serial Transfer", WRAM0
 
@@ -489,7 +489,10 @@ wNoEffectFromWhichStatus:: ; cd06
 wDeckSize:: ; cd07
 	ds $1
 
-	ds $2
+wcd08:: ; cd08
+	ds $1
+
+	ds $1
 
 wcd0a:: ; cd0a
 	ds $1
@@ -590,6 +593,12 @@ wUppercaseHalfWidthLetters:: ; cd76
 wEffectFunctionsBank:: ; cd79
 	ds $1
 
+wCardPalettes:: ; cd7a
+	ds 3 palettes
+
+wCardAttrMap:: ; cd92
+	ds $30
+
 SECTION "WRAM0 2@cdc2", WRAM0
 
 ; information about the text being currently processed, including font width,
@@ -695,6 +704,23 @@ wPrinterStatus:: ; cdf5
 wSerialDataPtr:: ; cdf6
 	ds $2
 
+	ds $55
+
+wce4d:: ; ce4d
+	ds $1
+
+wTargetBGPalettes:: ; ce4e
+	ds NUM_BACKGROUND_PALETTES palettes
+
+wTargetOBPalettes:: ; ce8e
+	ds NUM_OBJECT_PALETTES palettes
+
+wBGColorFadeConfigList:: ; cece
+	ds (NUM_BACKGROUND_PALETTES palettes) / 2
+
+wOBColorFadeConfigList:: ; ceee
+	ds (NUM_OBJECT_PALETTES palettes) / 2
+
 SECTION "WRAM1", WRAMX
 
 ; stores a pointer to a temporary list of elements (e.g. pointer to wDuelTempList)
@@ -829,7 +855,20 @@ wd553:: ; d553
 wd554:: ; d554
 	ds $1
 
-	ds $2d
+	ds $20
+
+wFilteredListPtr:: ; d575
+	ds $2
+
+wRemainingIntroCards:: ; d577
+	ds $1
+
+	ds $3
+
+wIntroCardsRepeatsAllowed:: ; d57b
+	ds $1
+
+	ds $6
 
 wd582:: ; d582
 	ds $1
@@ -976,7 +1015,10 @@ wd678:: ; d678
 wd68c:: ; d68c
 	ds $1
 
-	ds $7
+	ds $6
+
+wd693:: ; d693
+	ds $1
 
 wDecompressedBGMap:: ; d694
 	ds 2 * BG_MAP_WIDTH
@@ -1002,31 +1044,56 @@ wd7d8:: ; d7d8
 wd7d9:: ; d7d9
 	ds $1
 
-	ds $c8
+	ds $14
 
-; seems like structs for handling sprites in a scene
-wd8a2:: ; d8a2
-wSceneUnkStruct0:: scene_unk_struct wSceneUnkStruct0
-wSceneUnkStruct1:: scene_unk_struct wSceneUnkStruct1
-wSceneUnkStruct2:: scene_unk_struct wSceneUnkStruct2
-wSceneUnkStruct3:: scene_unk_struct wSceneUnkStruct3
-wSceneUnkStruct4:: scene_unk_struct wSceneUnkStruct4
-wSceneUnkStruct5:: scene_unk_struct wSceneUnkStruct5
-wSceneUnkStruct6:: scene_unk_struct wSceneUnkStruct6
-wSceneUnkStruct7:: scene_unk_struct wSceneUnkStruct7
-wSceneUnkStruct8:: scene_unk_struct wSceneUnkStruct8
-wSceneUnkStruct9:: scene_unk_struct wSceneUnkStruct9
+wd7ee:: ; d7ee
+	ds $64
 
-wd942:: ; d942
+wd852:: ; d852
 	ds $1
 
-wd943:: ; d943
+wd853:: ; d853
+	ds $40
+
+	ds $3
+
+wd896:: ; d896
+	ds $2
+
+	ds $5
+
+wd89d:: ; d89d
 	ds $1
 
-wd944:: ; d944
+wd89e:: ; d89e
 	ds $1
 
-	ds $2a
+	ds $2
+
+wd8a1:: ; d8a1
+	ds $1
+
+wSpriteAnimationStructs:: ; d8a2
+; wSpriteAnim1 - wSpriteAnim10
+FOR n, 1, NUM_SPRITE_ANIM_STRUCTS + 1
+wSpriteAnim{d:n}:: sprite_anim_struct wSpriteAnim{d:n}
+ENDR
+
+; used to keep track of tiles being copied to VRAM
+; bit 7: VRAM0 or VRAM1
+wCurVRAMTile:: ; d942
+	ds $1
+
+wNumSpriteTilesets:: ; d943
+	ds $1
+
+wSpriteTilesets:: ; d944
+; wSpriteTileset1 - wSpriteTileset10
+FOR n, 1, NUM_SPRITE_ANIM_STRUCTS + 1
+wSpriteTileset{d:n}:: obj_tile_struct wSpriteTileset{d:n}
+ENDR
+
+	ds $3
 
 wd96f:: ; d96f
 	ds $1
@@ -1045,41 +1112,190 @@ wd972:: ; d972
 wd975:: ; d975
 	ds $1
 
-wd976:: ; d976
+wCurSpriteAnim:: sprite_anim_struct wCurSpriteAnim ; d976
+
+wd986:: ; d986
 	ds $1
 
-wd977:: ; d977
+	ds $36
+
+wFrameFunctionStackSize:: ; d9bd
 	ds $1
 
-	ds $1
+wFrameFunctionStack:: ; d9be
+	ds $10
 
-wd979:: ; d979
-	ds $1
-
-wd97a:: ; d97a
-	ds $1
-
-wd97b:: ; d97b
-	ds $1
-
-wd97c:: ; d97c
-	ds $1
-
-wd97d:: ; d97d
-	ds $1
-
-wd97e:: ; d97e
-	ds $1
-
-wd97f:: ; d97f
-	ds $1
-
-wd980:: ; d980
 	ds $2
 
+wd9d0:: ; d9d0
 	ds $1
 
-wd983:: ; d983
+	ds $2
+
+wd9d3:: ; d9d3
+	ds $1
+
+wd9d4:: ; d9d4
+	ds $1
+
+wd9d5:: ; d9d5
+	ds $1
+
+wTextBoxFrameColor:: ; d9d6
+	ds $1
+
+	ds $5
+
+wd9dc:: ; d9dc
+	ds $1
+
+; $0 = no fading
+; $1 = fade to target palette
+; $2 = fade to black/white
+wPaletteFadeMode:: ; d9dd
+	ds $1
+
+wd9de:: ; d9de
+	ds $1
+
+; whether pal fading happens
+; as an increment or decrement
+; of the color values
+; when fading to black/white:
+;  bit 0 not set = fade to white
+;  bit 0 set     = fade to black
+; when fading to a target pal:
+;  bit 0 not set = color decrement
+;  bit 0 set     = color increment
+wPalFadeDirection:: ; d9df
+	ds $1
+
+wPaletteFadeCounter:: ; d9e0
+	ds $1
+
+wPaletteFadeSpeedMask:: ; d9e1
+	ds $1
+
+; whether palette fading is enabled
+; bit 0 set: enabled for BGP
+; bit 7 set: enabled for OBP
+wPaletteFadeFlags:: ; d9e2
+	ds $1
+
+SECTION "WRAM1@da39", WRAMX
+
+wda39:: ; da39
+	ds $50
+
+	ds $f
+
+wda98:: ; da98
+	ds $1
+
+wda99:: ; da99
+	ds $4
+
+SECTION "WRAM1@da9d", WRAMX
+
+wIntroOrbsStates:: ; da9d
+	ds NUM_INTRO_ORBS
+
+wIntroSceneCounter:: ; daa5
+wIntroCardIndex::
+	ds $1
+
+wIntroStateMode:: ; daa6
+	ds $1
+
+wIntroStateCounter:: ; daa7
+	ds $1
+
+	ds $1
+
+wTitleScreenCards:: ; daa9
+	ds 2 * NUM_TITLE_SCREEN_CARDS
+
+	ds $4
+
+wdabd:: ; dabd
+	ds $1
+
+	ds $1
+
+wdabf:: ; dabf
+	ds $1
+
+	ds $1
+
+wdac1:: ; dac1
+	ds $20
+
+	ds $1c
+
+wdafd:: ; dafd
+	ds $1
+
+	ds $21
+
+wdb1f:: ; db1f
+	ds $1
+
+SECTION "WRAM1@dc06", WRAMX
+
+wdc06:: ; dc06
+	ds $1
+
+	ds $1
+
+wdc08:: ; dc08
+	ds $2
+
+	ds $5
+
+wdc0f:: ; dc0f
+	ds $1
+
+	ds $47
+
+wdc57:: ; dc57
+	ds $1
+
+	ds $1
+
+wdc59:: ; dc59
+	ds $1
+
+	ds $4
+
+wdc5e:: ; dc5e
+	ds $2
+
+wdc60:: ; dc60
+	ds $80
+
+	ds $2
+
+wdce2:: ; dce2
+	ds $1
+
+	ds $2
+
+wdce5:: ; dce5
+	ds $1
+
+	ds $2
+
+wdce8:: ; dce8
+	ds $1
+
+	ds $1
+
+wdcea:: ; dcea
+	ds $1
+
+	ds $5
+
+wdcf0:: ; dcf0
 	ds $1
 
 SECTION "WRAM1@dd02", WRAMX
@@ -1092,7 +1308,19 @@ wDuelResult:: ; dd02
 wdd03:: ; dd03
 	ds $1
 
-	ds $21
+wdd04:: ; dd04
+	ds $1
+
+wdd05:: ; dd05
+	ds $1
+
+wdd06:: ; dd06
+	ds $1
+
+wdd07:: ; dd07
+	ds $1
+
+	ds $1d
 
 wdd25:: ; dd25
 	ds $2
@@ -1112,7 +1340,67 @@ wdd2d:: ; dd2d
 wdd2e:: ; dd2e
 	ds $1
 
-	ds $ca
+wdd2f:: ; dd2f
+	ds $1
+
+	ds $6
+
+wdd36:: ; dd36
+	ds $1
+
+wdd37:: ; dd37
+	ds $19
+
+wdd50:: ; dd50
+	ds $1
+
+wdd51:: ; dd51
+	ds $9
+
+wdd5a:: ; dd5a
+	ds $1
+
+wdd5b:: ; dd5b
+	ds $1
+
+wdd5c:: ; dd5c
+	ds $1
+
+wdd5d:: ; dd5d
+	ds $1
+
+wdd5e:: ; dd5e
+	ds $1
+
+wdd5f:: ; dd5f
+	ds $1
+
+wdd60:: ; dd60
+	ds $1
+
+	ds $12
+
+wdd73:: ; dd73
+	ds $1
+
+wdd74:: ; dd74
+	ds $1
+
+	ds $1f
+
+wCardTilemap:: ; dd94
+	ds $30
+
+wddc4:: ; ddc4
+	ds $30
+
+wCardTilemapOffset:: ; ddf4
+	ds $1
+
+wddf5:: ; ddf5
+	ds $1
+
+	ds $3
 
 wddf9:: ; ddf9
 	ds $14
@@ -1129,6 +1417,24 @@ wde15:: ; de15
 wde19:: ; de19
 	ds $20
 
+	ds $30
+
+wde69:: ; de69
+	ds $2
+
+SECTION "WRAM3", WRAMX
+
+w3d000:: ; d000
+	ds $1
+
+	ds $3ff
+
+w3d400:: ; d400
+	ds $1
+
+w3d401:: ; d401
+	ds $1
+
 SECTION "WRAM7 Audio", WRAMX
 
 wSVBKBackup:: ; d000