diff options
| -rwxr-xr-x | gfx/AB.2bpp | bin | 0 -> 32 bytes | |||
| -rwxr-xr-x | gfx/attack_anim_1.2bpp | bin | 0 -> 1264 bytes | |||
| -rwxr-xr-x | gfx/attack_anim_2.2bpp | bin | 0 -> 1264 bytes | |||
| -rwxr-xr-x | gfx/badge_numbers.2bpp | bin | 0 -> 128 bytes | |||
| -rwxr-xr-x | gfx/badges.2bpp | bin | 0 -> 1024 bytes | |||
| -rwxr-xr-x | gfx/battle_hud1.1bpp | bin | 0 -> 24 bytes | |||
| -rwxr-xr-x | gfx/battle_hud2.1bpp | bin | 0 -> 24 bytes | |||
| -rwxr-xr-x | gfx/battle_hud3.1bpp | bin | 0 -> 24 bytes | |||
| -rwxr-xr-x | gfx/battle_transition.2bpp | 1 | ||||
| -rwxr-xr-x | gfx/blank_leader_names.2bpp | bin | 0 -> 368 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | gfx/blue/introfight.2bpp | bin | 1680 -> 1744 bytes | |||
| -rwxr-xr-x | gfx/copyright.2bpp | bin | 0 -> 304 bytes | |||
| -rwxr-xr-x | gfx/diagonal_lines.2bpp | bin | 0 -> 32 bytes | |||
| -rwxr-xr-x | gfx/emotion_bubbles.2bpp | bin | 0 -> 200 bytes | |||
| -rwxr-xr-x | gfx/falling_star.2bpp | bin | 0 -> 16 bytes | |||
| -rwxr-xr-x | gfx/gamefreak.2bpp | bin | 0 -> 144 bytes | |||
| -rwxr-xr-x | gfx/gamefreak_intro.2bpp | bin | 0 -> 320 bytes | |||
| -rwxr-xr-x | gfx/intro_fight.2bpp | bin | 0 -> 1536 bytes | |||
| -rwxr-xr-x | gfx/ledge_hopping_shadow.1bpp | bin | 0 -> 8 bytes | |||
| -rwxr-xr-x | gfx/mon_ow_sprites.2bpp | bin | 0 -> 384 bytes | |||
| -rwxr-xr-x | gfx/player_title.2bpp | bin | 0 -> 560 bytes | |||
| -rwxr-xr-x | gfx/pokeball.2bpp | bin | 0 -> 64 bytes | |||
| -rwxr-xr-x | gfx/pokecenter_ball.2bpp | bin | 0 -> 32 bytes | |||
| -rwxr-xr-x | gfx/pokedex.2bpp | bin | 0 -> 288 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | gfx/red/introfight.2bpp | bin | 1680 -> 1744 bytes | |||
| -rwxr-xr-x | gfx/red_fishing.2bpp | bin | 0 -> 160 bytes | |||
| -rwxr-xr-x | gfx/spinner_arrow.2bpp | bin | 0 -> 64 bytes | |||
| -rwxr-xr-x | gfx/sprites/cycling.2bpp | bin | 0 -> 384 bytes | |||
| -rwxr-xr-x | gfx/town_map.2bpp | bin | 0 -> 256 bytes | |||
| -rwxr-xr-x | gfx/town_map.rle | bin | 0 -> 171 bytes | |||
| -rwxr-xr-x | gfx/town_map_cursor.1bpp | bin | 0 -> 32 bytes | |||
| -rwxr-xr-x | gfx/trade.2bpp | bin | 0 -> 784 bytes | |||
| -rwxr-xr-x | gfx/trade2.2bpp | bin | 0 -> 64 bytes | |||
| -rwxr-xr-x | gfx/trainer_info.2bpp | bin | 0 -> 144 bytes | |||
| -rwxr-xr-x | gfx/up_arrow.1bpp | bin | 0 -> 8 bytes | |||
| -rw-r--r-- | main.asm | 224 | ||||
| -rw-r--r-- | pic/monback/vulpikb.pic | bin | 101 -> 0 bytes |
37 files changed, 113 insertions, 112 deletions
diff --git a/gfx/AB.2bpp b/gfx/AB.2bpp Binary files differnew file mode 100755 index 00000000..5116536b --- /dev/null +++ b/gfx/AB.2bpp diff --git a/gfx/attack_anim_1.2bpp b/gfx/attack_anim_1.2bpp Binary files differnew file mode 100755 index 00000000..55dcfef5 --- /dev/null +++ b/gfx/attack_anim_1.2bpp diff --git a/gfx/attack_anim_2.2bpp b/gfx/attack_anim_2.2bpp Binary files differnew file mode 100755 index 00000000..51d87b27 --- /dev/null +++ b/gfx/attack_anim_2.2bpp diff --git a/gfx/badge_numbers.2bpp b/gfx/badge_numbers.2bpp Binary files differnew file mode 100755 index 00000000..664758aa --- /dev/null +++ b/gfx/badge_numbers.2bpp diff --git a/gfx/badges.2bpp b/gfx/badges.2bpp Binary files differnew file mode 100755 index 00000000..8a717ff7 --- /dev/null +++ b/gfx/badges.2bpp diff --git a/gfx/battle_hud1.1bpp b/gfx/battle_hud1.1bpp Binary files differnew file mode 100755 index 00000000..3d489cab --- /dev/null +++ b/gfx/battle_hud1.1bpp diff --git a/gfx/battle_hud2.1bpp b/gfx/battle_hud2.1bpp Binary files differnew file mode 100755 index 00000000..6ac1cb0b --- /dev/null +++ b/gfx/battle_hud2.1bpp diff --git a/gfx/battle_hud3.1bpp b/gfx/battle_hud3.1bpp Binary files differnew file mode 100755 index 00000000..0a43bdda --- /dev/null +++ b/gfx/battle_hud3.1bpp diff --git a/gfx/battle_transition.2bpp b/gfx/battle_transition.2bpp new file mode 100755 index 00000000..13ff23b1 --- /dev/null +++ b/gfx/battle_transition.2bpp @@ -0,0 +1 @@ +ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
\ No newline at end of file diff --git a/gfx/blank_leader_names.2bpp b/gfx/blank_leader_names.2bpp Binary files differnew file mode 100755 index 00000000..1eac2fae --- /dev/null +++ b/gfx/blank_leader_names.2bpp diff --git a/gfx/blue/introfight.2bpp b/gfx/blue/introfight.2bpp Binary files differindex 76d7070a..4666bbf9 100644..100755 --- a/gfx/blue/introfight.2bpp +++ b/gfx/blue/introfight.2bpp diff --git a/gfx/copyright.2bpp b/gfx/copyright.2bpp Binary files differnew file mode 100755 index 00000000..1e7b762b --- /dev/null +++ b/gfx/copyright.2bpp diff --git a/gfx/diagonal_lines.2bpp b/gfx/diagonal_lines.2bpp Binary files differnew file mode 100755 index 00000000..ed8d1e78 --- /dev/null +++ b/gfx/diagonal_lines.2bpp diff --git a/gfx/emotion_bubbles.2bpp b/gfx/emotion_bubbles.2bpp Binary files differnew file mode 100755 index 00000000..c8a13e2f --- /dev/null +++ b/gfx/emotion_bubbles.2bpp diff --git a/gfx/falling_star.2bpp b/gfx/falling_star.2bpp Binary files differnew file mode 100755 index 00000000..4cab94c8 --- /dev/null +++ b/gfx/falling_star.2bpp diff --git a/gfx/gamefreak.2bpp b/gfx/gamefreak.2bpp Binary files differnew file mode 100755 index 00000000..6524eb2e --- /dev/null +++ b/gfx/gamefreak.2bpp diff --git a/gfx/gamefreak_intro.2bpp b/gfx/gamefreak_intro.2bpp Binary files differnew file mode 100755 index 00000000..fed4d67f --- /dev/null +++ b/gfx/gamefreak_intro.2bpp diff --git a/gfx/intro_fight.2bpp b/gfx/intro_fight.2bpp Binary files differnew file mode 100755 index 00000000..5672e387 --- /dev/null +++ b/gfx/intro_fight.2bpp diff --git a/gfx/ledge_hopping_shadow.1bpp b/gfx/ledge_hopping_shadow.1bpp Binary files differnew file mode 100755 index 00000000..61d484f2 --- /dev/null +++ b/gfx/ledge_hopping_shadow.1bpp diff --git a/gfx/mon_ow_sprites.2bpp b/gfx/mon_ow_sprites.2bpp Binary files differnew file mode 100755 index 00000000..b318eba5 --- /dev/null +++ b/gfx/mon_ow_sprites.2bpp diff --git a/gfx/player_title.2bpp b/gfx/player_title.2bpp Binary files differnew file mode 100755 index 00000000..756cfcd5 --- /dev/null +++ b/gfx/player_title.2bpp diff --git a/gfx/pokeball.2bpp b/gfx/pokeball.2bpp Binary files differnew file mode 100755 index 00000000..626c4e3e --- /dev/null +++ b/gfx/pokeball.2bpp diff --git a/gfx/pokecenter_ball.2bpp b/gfx/pokecenter_ball.2bpp Binary files differnew file mode 100755 index 00000000..292f6954 --- /dev/null +++ b/gfx/pokecenter_ball.2bpp diff --git a/gfx/pokedex.2bpp b/gfx/pokedex.2bpp Binary files differnew file mode 100755 index 00000000..04a47d39 --- /dev/null +++ b/gfx/pokedex.2bpp diff --git a/gfx/red/introfight.2bpp b/gfx/red/introfight.2bpp Binary files differindex 62c20894..bbed4572 100644..100755 --- a/gfx/red/introfight.2bpp +++ b/gfx/red/introfight.2bpp diff --git a/gfx/red_fishing.2bpp b/gfx/red_fishing.2bpp Binary files differnew file mode 100755 index 00000000..11da1073 --- /dev/null +++ b/gfx/red_fishing.2bpp diff --git a/gfx/spinner_arrow.2bpp b/gfx/spinner_arrow.2bpp Binary files differnew file mode 100755 index 00000000..5c0d27c6 --- /dev/null +++ b/gfx/spinner_arrow.2bpp diff --git a/gfx/sprites/cycling.2bpp b/gfx/sprites/cycling.2bpp Binary files differnew file mode 100755 index 00000000..7a92c2ba --- /dev/null +++ b/gfx/sprites/cycling.2bpp diff --git a/gfx/town_map.2bpp b/gfx/town_map.2bpp Binary files differnew file mode 100755 index 00000000..54e45869 --- /dev/null +++ b/gfx/town_map.2bpp diff --git a/gfx/town_map.rle b/gfx/town_map.rle Binary files differnew file mode 100755 index 00000000..f9ede0ec --- /dev/null +++ b/gfx/town_map.rle diff --git a/gfx/town_map_cursor.1bpp b/gfx/town_map_cursor.1bpp Binary files differnew file mode 100755 index 00000000..46328979 --- /dev/null +++ b/gfx/town_map_cursor.1bpp diff --git a/gfx/trade.2bpp b/gfx/trade.2bpp Binary files differnew file mode 100755 index 00000000..e7c18503 --- /dev/null +++ b/gfx/trade.2bpp diff --git a/gfx/trade2.2bpp b/gfx/trade2.2bpp Binary files differnew file mode 100755 index 00000000..975f4da0 --- /dev/null +++ b/gfx/trade2.2bpp diff --git a/gfx/trainer_info.2bpp b/gfx/trainer_info.2bpp Binary files differnew file mode 100755 index 00000000..4baf4888 --- /dev/null +++ b/gfx/trainer_info.2bpp diff --git a/gfx/up_arrow.1bpp b/gfx/up_arrow.1bpp Binary files differnew file mode 100755 index 00000000..a3c69389 --- /dev/null +++ b/gfx/up_arrow.1bpp @@ -12059,7 +12059,7 @@ Func_4ca5: ; 4ca5 (1:4ca5) inc l inc l ld a, [$FF00+$8f] - ld de, Unknown_4d85 ; $4d85 + ld de, DiagonalLines ; $4d85 add a add e ld e, a @@ -12096,8 +12096,10 @@ Func_4d72: ; 4d72 (1:4d72) .asm_4d84 ret -Unknown_4d85: ; 4d85 (1:4d85) -INCBIN "baserom.gbc",$4d85,$4de1 - $4d85 +DiagonalLines: ; 4d85 (1:4d85) +INCBIN "gfx/diagonal_lines.2bpp" + +INCBIN "baserom.gbc",$4da5,$4de1 - $4da5 ; known jump sources: 24f7 (0:24f7) PickupItem: ; 4de1 (1:4de1) @@ -26804,7 +26806,7 @@ DrawBadges: ; ea03 (3:6a03) ; ea9e GymLeaderFaceAndBadgeTileGraphics: ; ea9e (3:6a9e) -INCBIN "baserom.gbc",$ea9e,$ee9e - $ea9e +INCBIN "gfx/badges.2bpp" ; known jump sources: 19f70 (6:5f70), 19f83 (6:5f83), 19f94 (6:5f94), 1a1e0 (6:61e0), 1eb3e (7:6b3e), 44312 (11:4312), 449ae (11:49ae), 517e7 (14:57e7), 51b9a (14:5b9a), 51bad (14:5bad), 51bbe (14:5bbe), 52034 (14:6034), 526cf (14:66cf), 5653b (15:653b), 59f94 (16:5f94), 59fa5 (16:5fa5), 5a170 (16:6170), 5a2f2 (16:62f2), 5ca87 (17:4a87), 5d7f4 (17:57f4), 5d807 (17:5807), 5d81a (17:581a), 5d82b (17:582b), 5da37 (17:5a37), 62131 (18:6131), 761b3 (1d:61b3), 7630a (1d:630a), 76461 (1d:6461) Func_ee9e: ; ee9e (3:6e9e) @@ -29009,37 +29011,38 @@ PokemonLogoGraphics: ; 11380 (4:5380) FontGraphics: ; 11a80 (4:5a80) INCBIN "gfx/font.1bpp" -INCBIN "baserom.gbc",$11e80,$11ea0 - $11e80 +ABTiles: ; 11e80 (4:5e80) + INCBIN "gfx/AB.2bpp" HpBarAndStatusGraphics: ; 11ea0 (4:5ea0) INCBIN "gfx/hp_bar_and_status.2bpp" -Unknown_12080: ; 12080 (4:6080) -INCBIN "baserom.gbc",$12080,$12098 - $12080 +BattleHudTiles1: ; 12080 (4:6080) +INCBIN "gfx/battle_hud1.1bpp" -Unknown_12098: ; 12098 (4:6098) -INCBIN "baserom.gbc",$12098,$120b0 - $12098 +BattleHudTiles2: ; 12098 (4:6098) +INCBIN "gfx/battle_hud2.1bpp" -Unknown_120b0: ; 120b0 (4:60b0) -INCBIN "baserom.gbc",$120b0,$120c8 - $120b0 +BattleHudTiles3: ; 120b0 (4:60b0) +INCBIN "gfx/battle_hud3.1bpp" NintendoCopyrightLogoGraphics: ; 120c8 (4:60c8) -INCBIN "baserom.gbc",$120c8,$121f8 - $120c8 +INCBIN "gfx/copyright.2bpp" GamefreakLogoGraphics: ; 121f8 (4:61f8) -INCBIN "baserom.gbc",$121f8,$12288 - $121f8 +INCBIN "gfx/gamefreak.2bpp" TextBoxGraphics: ; 12288 (4:6288) INCBIN "gfx/text_box.2bpp" PokedexTileGraphics: ; 12488 (4:6488) -INCBIN "baserom.gbc",$12488,$125a8 - $12488 +INCBIN "gfx/pokedex.2bpp" WorldMapTileGraphics: ; 125a8 (4:65a8) -INCBIN "baserom.gbc",$125a8,$126a8 - $125a8 +INCBIN "gfx/town_map.2bpp" PlayerCharacterTitleGraphics: ; 126a8 (4:66a8) -INCBIN "baserom.gbc",$126a8,$128d8 - $126a8 +INCBIN "gfx/player_title.2bpp" ; known jump sources: 1388d (4:788d) Func_128d8: ; 128d8 (4:68d8) @@ -29147,17 +29150,17 @@ StatusScreen: ; 12953 (4:6953) call ClearScreen call UpdateSprites ; move sprites (?) call LoadHpBarAndStatusTilePatterns - ld de, Unknown_12080 ; $6080 ; source + ld de, BattleHudTiles1 ; $6080 ; source ld hl, $96d0 ; dest - ld bc, (BANK(Unknown_12080) << 8) + $03 ; bank bytes/8 + ld bc, (BANK(BattleHudTiles1) << 8) + $03 ; bank bytes/8 call CopyVideoDataDouble ; ·│ :L and halfarrow line end - ld de, Unknown_12098 ; $6098 + ld de, BattleHudTiles2 ; $6098 ld hl, $9780 - ld bc, (BANK(Unknown_12098) << 8) + $01 + ld bc, (BANK(BattleHudTiles2) << 8) + $01 call CopyVideoDataDouble ; │ - ld de, Unknown_120b0 ; $60b0 + ld de, BattleHudTiles3 ; $60b0 ld hl, $9760 - ld bc, (BANK(Unknown_120b0) << 8) + $02 + ld bc, (BANK(BattleHudTiles3) << 8) + $02 call CopyVideoDataDouble ; ─┘ ld de, PTile ld hl, $9720 @@ -30504,7 +30507,7 @@ DrawTrainerInfo: ; 1349a (4:749a) ld bc,$0080 push bc call TrainerInfo_FarCopyData - ld hl,UnknownGFX_2fc28 ; $7c28 + ld hl,BlankLeaderNames ; $7c28 ld de,$9600 ld bc,$0170 call TrainerInfo_FarCopyData @@ -31254,8 +31257,7 @@ GenRandom_: ; 13a8f (4:7a8f) SECTION "bank5",ROMX,BANK[$5] RedCyclingSprite: ; 14000 (5:4000) -INCBIN "baserom.gbc",$14000,$14180 - $14000 - + INCBIN "gfx/sprites/cycling.2bpp" ; was $14000 RedSprite: ; 14180 (5:4180) INCBIN "gfx/sprites/red.2bpp" ; was $14180 BlueSprite: ; 14300 (5:4300) @@ -32387,7 +32389,7 @@ Func_17c47: ; 17c47 (5:7c47) ld a, [hl] add $8 ld c, a - ld de, Unknown_17cb5 ; $7cb5 + ld de, EmotionBubbles ; $7cb5 xor a call WriteOAMBlock ld c, $3c @@ -32400,8 +32402,8 @@ Func_17c47: ; 17c47 (5:7c47) Unknown_17caf: ; 17caf (5:7caf) INCBIN "baserom.gbc",$17caf,$17cb5 - $17caf -Unknown_17cb5: ; 17cb5 (5:7cb5) -INCBIN "baserom.gbc",$17cb5,$17d7d - $17cb5 +EmotionBubbles: ; 17cb5 (5:7cb5) +INCBIN "gfx/emotion_bubbles.2bpp" ; known jump sources: 71c87 (1c:5c87) Func_17d7d: ; 17d7d (5:7d7d) @@ -36579,8 +36581,8 @@ INCBIN "baserom.gbc",$1a6cf,$1a6f0 - $1a6cf ; known jump sources: 1a6c6 (6:66c6) Func_1a6f0: ; 1a6f0 (6:66f0) ld hl, $8ff0 - ld de, Unknown_1a708 ; $6708 - ld bc, (BANK(Unknown_1a708) << 8) + $01 + ld de, LedgeHoppingShadow ; $6708 + ld bc, (BANK(LedgeHoppingShadow) << 8) + $01 call CopyVideoDataDouble ld a, $9 ld bc, $5448 @@ -36588,8 +36590,8 @@ Func_1a6f0: ; 1a6f0 (6:66f0) call WriteOAMBlock ret -Unknown_1a708: ; 1a708 (6:6708) -INCBIN "baserom.gbc",$1a708,$1a710 - $1a708 +LedgeHoppingShadow: ; 1a708 (6:6708) +INCBIN "gfx/ledge_hopping_shadow.1bpp" Unknown_1a710: ; 1a710 (6:6710) INCBIN "baserom.gbc",$1a710,$1bcc8 - $1a710 @@ -44737,14 +44739,14 @@ UnnamedText_2fb93: ; 2fb93 (b:7b93) ; 0x2fb93 + 5 bytes TrainerInfoTextBoxTileGraphics: ; 2fb98 (b:7b98) -INCBIN "baserom.gbc",$2fb98,$2fc28 - $2fb98 +INCBIN "gfx/trainer_info.2bpp" ; mostly empty, last tile contains circle -UnknownGFX_2fc28: ; 2fc28 (b:7c28) -INCBIN "baserom.gbc",$2fc28,$2fd98 - $2fc28 +BlankLeaderNames: ; 2fc28 (b:7c28) +INCBIN "gfx/blank_leader_names.2bpp" BadgeNumbersTileGraphics: ; 2fd98 (b:7d98) -INCBIN "baserom.gbc",$2fd98,$2fe18 - $2fd98 +INCBIN "gfx/badge_numbers.2bpp" ; known jump sources: e530 (3:6530) Func_2fe18: ; 2fe18 (b:7e18) @@ -53889,15 +53891,15 @@ Func_3a948: ; 3a948 (e:6948) ; four tiles: pokeball, black pokeball (status ailment), crossed out pokeball (faited) and pokeball slot (no mon) PokeballTileGraphics: ; 3a97e (e:697e) -INCBIN "baserom.gbc",$3a97e,$3a9be - $3a97e +INCBIN "gfx/pokeball.2bpp" ; tiles for gameboy and link cable graphics used for trading sequence animation TradingAnimationGraphics: ; 3a9be (e:69be) -INCBIN "baserom.gbc",$3a9be,$3acce - $3a9be +INCBIN "gfx/trade.2bpp" ; 4 tiles for actual wire transfer animation (pokeball wandering inside wire) TradingAnimationGraphics2: ; 3acce (e:6cce) -INCBIN "baserom.gbc",$3acce,$3ad0e - $3acce +INCBIN "gfx/trade2.2bpp" ; known jump sources: df11 (3:5f11), 17da3 (5:7da3) Func_3ad0e: ; 3ad0e (e:6d0e) @@ -63602,24 +63604,24 @@ Func_3ee5b: ; 3ee5b (f:6e5b) ld a, [rLCDC] ; $FF00+$40 add a jr c, .asm_3ee7c - ld hl, Unknown_12080 ; $6080 + ld hl, BattleHudTiles1 ; $6080 ld de, $96d0 ld bc, $18 - ld a, BANK(Unknown_12080) + ld a, BANK(BattleHudTiles1) call FarCopyDataDouble - ld hl, Unknown_12098 ; $6098 + ld hl, BattleHudTiles2 ; $6098 ld de, $9730 ld bc, $30 - ld a, BANK(Unknown_12098) + ld a, BANK(BattleHudTiles2) jp FarCopyDataDouble .asm_3ee7c - ld de, Unknown_12080 ; $6080 + ld de, BattleHudTiles1 ; $6080 ld hl, $96d0 - ld bc, (BANK(Unknown_12080) << 8) + $03 + ld bc, (BANK(BattleHudTiles1) << 8) + $03 call CopyVideoDataDouble - ld de, Unknown_12098 ; $6098 + ld de, BattleHudTiles2 ; $6098 ld hl, $9730 - ld bc, (BANK(Unknown_12098) << 8) + $06 + ld bc, (BANK(BattleHudTiles2) << 8) + $06 jp CopyVideoDataDouble ; known jump sources: 3c5f7 (f:45f7), 3c79b (f:479b), 3c952 (f:4952), 3ccf4 (f:4cf4), 3cebf (f:4ebf), 553f1 (15:53f1) @@ -68508,25 +68510,25 @@ INCBIN "baserom.gbc",$41849,$41852 - $41849 ; known jump sources: 418ad (10:58ad) Func_41852: ; 41852 (10:5852) - ld hl, Unknown_41a99 ; $5a99 + ld hl, FightIntroBackMon ; $5a99 ld de, $9000 ld bc, $600 - ld a, BANK(Unknown_41a99) + ld a, BANK(FightIntroBackMon) call FarCopyData2 - ld hl, Unknown_41959 ; $5959 + ld hl, GameFreakIntro ; $5959 ld de, $9600 ld bc, $140 - ld a, BANK(Unknown_41959) + ld a, BANK(GameFreakIntro) call FarCopyData2 - ld hl, Unknown_41959 ; $5959 + ld hl, GameFreakIntro ; $5959 ld de, $8800 ld bc, $140 - ld a, BANK(Unknown_41959) + ld a, BANK(GameFreakIntro) call FarCopyData2 - ld hl, Unknown_42099 ; $6099 + ld hl, FightIntroFrontMon ; $6099 ld de, $8000 ld bc, $6c0 - ld a, BANK(Unknown_42099) + ld a, BANK(FightIntroFrontMon) jp FarCopyData2 ; known jump sources: 41688 (10:5688) @@ -68611,14 +68613,13 @@ INCBIN "baserom.gbc",$41947,$41950 - $41947 Unknown_41950: ; 41950 (10:5950) INCBIN "baserom.gbc",$41950,$41959 - $41950 -Unknown_41959: ; 41959 (10:5959) -INCBIN "baserom.gbc",$41959,$41a99 - $41959 +GameFreakIntro: ; 41959 (10:5959) +INCBIN "gfx/gamefreak_intro.2bpp" -Unknown_41a99: ; 41a99 (10:5a99) -INCBIN "baserom.gbc",$41a99,$42099 - $41a99 +FightIntroBackMon: ; 41a99 (10:5a99) +INCBIN "gfx/intro_fight.2bpp" -Unknown_42099: ; 42099 (10:6099) -INCBIN "baserom.gbc",$42099,$420d9 - $42099 +FightIntroFrontMon: ; 42099 (10:6099) IF _RED INCBIN "gfx/red/introfight.2bpp" @@ -70140,24 +70141,24 @@ Func_44fd7: ; 44fd7 (11:4fd7) Unknown_45023: ; 45023 (11:5023) ; 0x45023 XXX: it looks to me this is probably data for copying tiles into memory, maybe to mix and match a few tilesets, but I don't really know for sure - dw UnknownGFX_45087 ;address from within tileset graphics + dw SpinnerArrowAnimTiles ;address from within tileset graphics db 1 ;number of tiles to copy? - db BANK(UnknownGFX_45087) ;bank of tileset graphics + db BANK(SpinnerArrowAnimTiles) ;bank of tileset graphics dw $9200 ;where to load in VRAM - dw UnknownGFX_45087 + $10 + dw SpinnerArrowAnimTiles + $10 db 1 - db BANK(UnknownGFX_45087) + db BANK(SpinnerArrowAnimTiles) dw $9210 - dw UnknownGFX_45087 + $20 + dw SpinnerArrowAnimTiles + $20 db 1 - db BANK(UnknownGFX_45087) + db BANK(SpinnerArrowAnimTiles) dw $9300 - dw UnknownGFX_45087 + $30 + dw SpinnerArrowAnimTiles + $30 db 1 - db BANK(UnknownGFX_45087) + db BANK(SpinnerArrowAnimTiles) dw $9310 dw Tset16_GFX + $200 @@ -70181,24 +70182,24 @@ Unknown_45023: ; 45023 (11:5023) dw $9310 Unknown_45053: ; 45053 (11:5053) - dw UnknownGFX_45087 + $10 + dw SpinnerArrowAnimTiles + $10 db 1 - db BANK(UnknownGFX_45087) + db BANK(SpinnerArrowAnimTiles) dw $93C0 - dw UnknownGFX_45087 + $30 + dw SpinnerArrowAnimTiles + $30 db 1 - db BANK(UnknownGFX_45087) + db BANK(SpinnerArrowAnimTiles) dw $93D0 - dw UnknownGFX_45087 + dw SpinnerArrowAnimTiles db 1 - db BANK(UnknownGFX_45087) + db BANK(SpinnerArrowAnimTiles) dw $94C0 - dw UnknownGFX_45087 + $20 + dw SpinnerArrowAnimTiles + $20 db 1 - db BANK(UnknownGFX_45087) + db BANK(SpinnerArrowAnimTiles) dw $94D0 dw Tset05_GFX + $3C0 @@ -70224,9 +70225,9 @@ Unknown_45053: ; 45053 (11:5053) Unknown_45083: ; 45083 (11:5083) INCBIN "baserom.gbc",$45083,$45087 - $45083 -; four tiles apparently forming a 2x2 diamond shaped pattern -UnknownGFX_45087: ; 45087 (11:5087) -INCBIN "baserom.gbc",$45087,$450c7 - $45087 +; these tiles are the animation for the tiles that push the player in dungeons like Rocket HQ +SpinnerArrowAnimTiles: ; 45087 (11:5087) +INCBIN "gfx/spinner_arrow.2bpp" RocketHideout2Texts: ; 450c7 (11:50c7) dw RocketHideout2Text1, Predef5CText, Predef5CText, Predef5CText, Predef5CText @@ -72980,8 +72981,6 @@ Route4HiddenObjects: ; 470a4 (11:70a4) dbw BANK(HiddenItems),HiddenItems db $FF -INCBIN "baserom.gbc",$470ab,$48000 - $470ab - SECTION "bank12",ROMX,BANK[$12] Route7_h: ; 0x48000 to 0x48022 (34 bytes) (bank=12) (id=18) @@ -85905,10 +85904,10 @@ DisplayDiploma: ; 566e2 (15:66e2) ld hl, $d730 set 6, [hl] call DisableLCD - ld hl, UnknownGFX_2fc28 + $160 ; $7d88 ; circle tile + ld hl, BlankLeaderNames + $160 ; $7d88 ; circle tile ld de, $9700 ld bc, $0010 - ld a, BANK(UnknownGFX_2fc28) + ld a, BANK(BlankLeaderNames) call FarCopyData2 ld hl, W_SCREENTILESBUFFER ld bc, $1012 @@ -98311,9 +98310,9 @@ Func_70000: ; 70000 (1c:4000) ld hl, $8a10 ld bc, (BANK(AnimationTileset2) << 8) + $01 call CopyVideoData - ld de, Unknown_70190 ; $4190 + ld de, FallingStar ; $4190 ld hl, $8a20 - ld bc, (BANK(Unknown_70190) << 8) + $01 + ld bc, (BANK(FallingStar) << 8) + $01 call CopyVideoData ld hl, Unknown_70140 ; $4140 ld de, $c360 @@ -98467,8 +98466,8 @@ INCBIN "baserom.gbc",$70140,$70180 - $70140 Unknown_70180: ; 70180 (1c:4180) INCBIN "baserom.gbc",$70180,$70190 - $70180 -Unknown_70190: ; 70190 (1c:4190) -INCBIN "baserom.gbc",$70190,$701a0 - $70190 +FallingStar: ; 70190 (1c:4190) +INCBIN "gfx/falling_star.2bpp" ; known jump sources: 74061 (1d:4061) Func_701a0: ; 701a0 (1c:41a0) @@ -98789,9 +98788,9 @@ Func_70423: ; 70423 (1c:4423) ; known jump sources: 7027 (1:7027) Func_70433: ; 70433 (1c:4433) - ld de, Unknown_704b7 ; $44b7 + ld de, PokeCenterHealBall ; $44b7 ld hl, $87c0 - ld bc, (BANK(Unknown_704b7) << 8) + $03 + ld bc, (BANK(PokeCenterHealBall) << 8) + $03 call CopyVideoData ld hl, $cfcb ld a, [hl] @@ -98852,8 +98851,8 @@ Func_70433: ; 70433 (1c:4433) ld [hl], a jp UpdateSprites -Unknown_704b7: ; 704b7 (1c:44b7) -INCBIN "baserom.gbc",$704b7,$704d7 - $704b7 +PokeCenterHealBall: ; 704b7 (1c:44b7) +INCBIN "gfx/pokecenter_ball.2bpp" Unknown_704d7: ; 704d7 (1c:44d7) INCBIN "baserom.gbc",$704d7,$704f3 - $704d7 @@ -99588,12 +99587,12 @@ INCBIN "baserom.gbc",$70a44,$70a4d - $70a44 ; known jump sources: 709b3 (1c:49b3) Func_70a4d: ; 70a4d (1c:4a4d) ld hl, $8ff0 - ld de, Unknown_70a59 ; $4a59 - ld bc, (BANK(Unknown_70a59) << 8) + $01 + ld de, BattleTransitionTile ; $4a59 + ld bc, (BANK(BattleTransitionTile) << 8) + $01 jp CopyVideoData -Unknown_70a59: ; 70a59 (1c:4a59) -INCBIN "baserom.gbc",$70a59,$70a69 - $70a59 +BattleTransitionTile: ; 70a59 (1c:4a59) +INCBIN "gfx/battle_transition.2bpp" ; known jump sources: 70a9f (1c:4a9f), 70bc2 (1c:4bc2), 70c0a (1c:4c0a), 70ca7 (1c:4ca7), 70cd5 (1c:4cd5), 70d4d (1c:4d4d) Func_70a69: ; 70a69 (1c:4a69) @@ -100139,8 +100138,8 @@ Func_70e3e: ; 70e3e (1c:4e3e) ld bc, $10 call CopyData ld hl, $8040 - ld de, Unknown_70f40 ; $4f40 - ld bc, (BANK(Unknown_70f40) << 8) + $04 + ld de, TownMapCursor ; $4f40 + ld bc, (BANK(TownMapCursor) << 8) + $04 call CopyVideoDataDouble xor a ld [W_WHICHTRADE], a ; $cd3d @@ -100228,8 +100227,8 @@ asm_70e92: ; 70e92 (1c:4e92) Unknown_70f11: ; 70f11 (1c:4f11) INCBIN "baserom.gbc",$70f11,$70f40 - $70f11 -Unknown_70f40: ; 70f40 (1c:4f40) -INCBIN "baserom.gbc",$70f40,$70f60 - $70f40 +TownMapCursor: ; 70f40 (1c:4f40) +INCBIN "gfx/town_map_cursor.1bpp" ; known jump sources: 4010a (10:410a) Func_70f60: ; 70f60 (1c:4f60) @@ -100268,9 +100267,9 @@ Func_70f90: ; 70f90 (1c:4f90) ld hl, $8040 ld bc, (BANK(BirdSprite) << 8) + $0c call CopyVideoData - ld de, Unknown_71093 ; $5093 + ld de, TownMapUpArrow ; $5093 ld hl, $8ed0 - ld bc, (BANK(Unknown_71093) << 8) + $01 + ld bc, (BANK(TownMapUpArrow) << 8) + $01 call CopyVideoDataDouble call Func_71070 ld hl, $cfcb @@ -100405,8 +100404,8 @@ Func_71070: ; 71070 (1c:5070) ld [hl], $ff ret -Unknown_71093: ; 71093 (1c:5093) -INCBIN "baserom.gbc",$71093,$7109b - $71093 +TownMapUpArrow: ; 71093 (1c:5093) +INCBIN "gfx/up_arrow.1bpp" ; known jump sources: 70e3e (1c:4e3e), 70f60 (1c:4f60), 70f93 (1c:4f93) Func_7109b: ; 7109b (1c:509b) @@ -100461,7 +100460,7 @@ Func_7109b: ; 7109b (1c:509b) ; 71100 (1c:5100) CompressedMap: ; 71100 (1c:5100) ; you can decompress this file with the redrle program in the extras/ dir - INCBIN "baserom.gbc",$71100,$711AB-$71100 + INCBIN "gfx/town_map.rle" ; known jump sources: 70eeb (1c:4eeb), 70f82 (1c:4f82) Func_711ab: ; 711ab (1c:51ab) @@ -101260,7 +101259,8 @@ MonOverworldData: ; 7190d (1c:590d) dn SPRITE_SNAKE, SPRITE_MON ;Dragonite/Mewtwo dn SPRITE_MON, 0 ;Mew/Padding -INCBIN "baserom.gbc",$71959,$71ad9 - $71959 +MonOverworldSprites: + INCBIN "gfx/mon_ow_sprites.2bpp" Predef54: ; 71ad9 (1c:5ad9) ; trigger the trade offer/action specified by W_WHICHTRADE @@ -108682,10 +108682,10 @@ dw AnimationTileset1 db $FF AnimationTileset1: ; 781fe (1e:41fe) -INCBIN "baserom.gbc",$781fe,$786ee - $781fe +INCBIN "gfx/attack_anim_1.2bpp" AnimationTileset2: ; 786ee (1e:46ee) -INCBIN "baserom.gbc",$786ee,$78bde - $786ee +INCBIN "gfx/attack_anim_2.2bpp" IF _RED INCBIN "gfx/red/slotmachine2.2bpp" @@ -110800,12 +110800,12 @@ Func_79fc0: ; 79fc0 (1e:5fc0) ; known jump sources: 79fc7 (1e:5fc7) Func_79fd4: ; 79fd4 (1e:5fd4) - ld de, Unknown_79fdd ; $5fdd - ld bc, (BANK(Unknown_79fdd) << 8) + $01 + ld de, RedFishingTiles ; $5fdd + ld bc, (BANK(RedFishingTiles) << 8) + $01 jp CopyVideoData -Unknown_79fdd: ; 79fdd (1e:5fdd) -INCBIN "baserom.gbc",$79fdd,$7a07d - $79fdd +RedFishingTiles: ; 79fdd (1e:5fdd) +INCBIN "gfx/red_fishing.2bpp" Unknown_7a07d: ; 7a07d (1e:607d) INCBIN "baserom.gbc",$7a07d,$7a76d - $7a07d diff --git a/pic/monback/vulpikb.pic b/pic/monback/vulpikb.pic Binary files differdeleted file mode 100644 index 8cfa93dd..00000000 --- a/pic/monback/vulpikb.pic +++ /dev/null |