From 6595aaea504b8fcb261c155747f638396da4b613 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Sat, 17 Aug 2013 08:49:56 -0400 Subject: Removed duplicate Vulpix pic, "vulpikb.pic" --- pic/monback/vulpikb.pic | Bin 101 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 pic/monback/vulpikb.pic diff --git a/pic/monback/vulpikb.pic b/pic/monback/vulpikb.pic deleted file mode 100644 index 8cfa93dd..00000000 Binary files a/pic/monback/vulpikb.pic and /dev/null differ -- cgit v1.2.3 From bae9ef77eeb98dff56f4dc613b40e618bd308e7c Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Sun, 18 Aug 2013 14:28:51 -0400 Subject: Added a new file for badge tiles --- gfx/GymLeaderFaceAndBadgeTileGraphics.2bpp | Bin 0 -> 1024 bytes main.asm | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100755 gfx/GymLeaderFaceAndBadgeTileGraphics.2bpp diff --git a/gfx/GymLeaderFaceAndBadgeTileGraphics.2bpp b/gfx/GymLeaderFaceAndBadgeTileGraphics.2bpp new file mode 100755 index 00000000..8a717ff7 Binary files /dev/null and b/gfx/GymLeaderFaceAndBadgeTileGraphics.2bpp differ diff --git a/main.asm b/main.asm index 64d45bca..062d22c2 100644 --- a/main.asm +++ b/main.asm @@ -26804,7 +26804,7 @@ DrawBadges: ; ea03 (3:6a03) ; ea9e GymLeaderFaceAndBadgeTileGraphics: ; ea9e (3:6a9e) -INCBIN "baserom.gbc",$ea9e,$ee9e - $ea9e +INCBIN "gfx/GymLeaderFaceAndBadgeTileGraphics.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) -- cgit v1.2.3 From fafc2877675578e64fc1c3efc96692802d5bc56b Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Sun, 18 Aug 2013 15:34:49 -0400 Subject: Added 1bpp battle hud graphics and renamed "badges.2bpp" --- gfx/GymLeaderFaceAndBadgeTileGraphics.2bpp | Bin 1024 -> 0 bytes gfx/badges.2bpp | Bin 0 -> 1024 bytes gfx/battle_hud1.1bpp | Bin 0 -> 24 bytes gfx/battle_hud2.1bpp | Bin 0 -> 24 bytes gfx/battle_hud3.1bpp | Bin 0 -> 24 bytes main.asm | 42 ++++++++++++++--------------- 6 files changed, 21 insertions(+), 21 deletions(-) delete mode 100755 gfx/GymLeaderFaceAndBadgeTileGraphics.2bpp create mode 100755 gfx/badges.2bpp create mode 100755 gfx/battle_hud1.1bpp create mode 100755 gfx/battle_hud2.1bpp create mode 100755 gfx/battle_hud3.1bpp diff --git a/gfx/GymLeaderFaceAndBadgeTileGraphics.2bpp b/gfx/GymLeaderFaceAndBadgeTileGraphics.2bpp deleted file mode 100755 index 8a717ff7..00000000 Binary files a/gfx/GymLeaderFaceAndBadgeTileGraphics.2bpp and /dev/null differ diff --git a/gfx/badges.2bpp b/gfx/badges.2bpp new file mode 100755 index 00000000..8a717ff7 Binary files /dev/null and b/gfx/badges.2bpp differ diff --git a/gfx/battle_hud1.1bpp b/gfx/battle_hud1.1bpp new file mode 100755 index 00000000..3d489cab Binary files /dev/null and b/gfx/battle_hud1.1bpp differ diff --git a/gfx/battle_hud2.1bpp b/gfx/battle_hud2.1bpp new file mode 100755 index 00000000..6ac1cb0b Binary files /dev/null and b/gfx/battle_hud2.1bpp differ diff --git a/gfx/battle_hud3.1bpp b/gfx/battle_hud3.1bpp new file mode 100755 index 00000000..0a43bdda Binary files /dev/null and b/gfx/battle_hud3.1bpp differ diff --git a/main.asm b/main.asm index 062d22c2..bb85a899 100644 --- a/main.asm +++ b/main.asm @@ -26804,7 +26804,7 @@ DrawBadges: ; ea03 (3:6a03) ; ea9e GymLeaderFaceAndBadgeTileGraphics: ; ea9e (3:6a9e) -INCBIN "gfx/GymLeaderFaceAndBadgeTileGraphics.2bpp" +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) @@ -29014,14 +29014,14 @@ INCBIN "baserom.gbc",$11e80,$11ea0 - $11e80 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 @@ -29147,17 +29147,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 @@ -63602,24 +63602,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) -- cgit v1.2.3 From d87796e0ad73401f12e128132e8323c22c8d547c Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Sun, 18 Aug 2013 16:17:56 -0400 Subject: Added town map tiles to gfx --- gfx/town_map.2bpp | Bin 0 -> 256 bytes main.asm | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100755 gfx/town_map.2bpp diff --git a/gfx/town_map.2bpp b/gfx/town_map.2bpp new file mode 100755 index 00000000..54e45869 Binary files /dev/null and b/gfx/town_map.2bpp differ diff --git a/main.asm b/main.asm index bb85a899..2fafe7b5 100644 --- a/main.asm +++ b/main.asm @@ -29036,7 +29036,7 @@ PokedexTileGraphics: ; 12488 (4:6488) INCBIN "baserom.gbc",$12488,$125a8 - $12488 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 -- cgit v1.2.3 From d643241c1eb6e54e201ba80e46406320a5d48359 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Mon, 19 Aug 2013 18:41:40 -0400 Subject: Added "AB" tiles to gfx --- gfx/AB.2bpp | Bin 0 -> 32 bytes main.asm | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100755 gfx/AB.2bpp diff --git a/gfx/AB.2bpp b/gfx/AB.2bpp new file mode 100755 index 00000000..5116536b Binary files /dev/null and b/gfx/AB.2bpp differ diff --git a/main.asm b/main.asm index 2fafe7b5..e02e9bc9 100644 --- a/main.asm +++ b/main.asm @@ -29009,7 +29009,8 @@ 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" -- cgit v1.2.3 From 89a68ac109400b28a0170eed587a3441a4268c86 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Mon, 19 Aug 2013 18:50:24 -0400 Subject: Added copyright tiles to gfx --- gfx/copyright.2bpp | Bin 0 -> 304 bytes main.asm | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100755 gfx/copyright.2bpp diff --git a/gfx/copyright.2bpp b/gfx/copyright.2bpp new file mode 100755 index 00000000..1e7b762b Binary files /dev/null and b/gfx/copyright.2bpp differ diff --git a/main.asm b/main.asm index e02e9bc9..de6e5a4b 100644 --- a/main.asm +++ b/main.asm @@ -29025,7 +29025,7 @@ 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 -- cgit v1.2.3 From dcf9ee83c1205c22027669bb85e326d6dd8cffe0 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Mon, 19 Aug 2013 18:55:00 -0400 Subject: Added Game Freak tiles to gfx --- gfx/gamefreak.2bpp | Bin 0 -> 144 bytes main.asm | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100755 gfx/gamefreak.2bpp diff --git a/gfx/gamefreak.2bpp b/gfx/gamefreak.2bpp new file mode 100755 index 00000000..6524eb2e Binary files /dev/null and b/gfx/gamefreak.2bpp differ diff --git a/main.asm b/main.asm index de6e5a4b..3916717f 100644 --- a/main.asm +++ b/main.asm @@ -29028,7 +29028,7 @@ NintendoCopyrightLogoGraphics: ; 120c8 (4:60c8) 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" -- cgit v1.2.3 From 72838d699d859cc6eabddb62d98e6f3c70ba6a85 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Mon, 19 Aug 2013 18:59:25 -0400 Subject: Added Pokedex tiles to gfx --- gfx/pokedex.2bpp | Bin 0 -> 288 bytes main.asm | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100755 gfx/pokedex.2bpp diff --git a/gfx/pokedex.2bpp b/gfx/pokedex.2bpp new file mode 100755 index 00000000..04a47d39 Binary files /dev/null and b/gfx/pokedex.2bpp differ diff --git a/main.asm b/main.asm index 3916717f..a124ba2d 100644 --- a/main.asm +++ b/main.asm @@ -29034,7 +29034,7 @@ 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 "gfx/town_map.2bpp" -- cgit v1.2.3 From 4ed9e7d52624f1084633bb62efebabe91e4c98e5 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Mon, 19 Aug 2013 19:04:44 -0400 Subject: Added player title screen tiles to gfx --- gfx/player_title.2bpp | Bin 0 -> 560 bytes main.asm | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100755 gfx/player_title.2bpp diff --git a/gfx/player_title.2bpp b/gfx/player_title.2bpp new file mode 100755 index 00000000..756cfcd5 Binary files /dev/null and b/gfx/player_title.2bpp differ diff --git a/main.asm b/main.asm index a124ba2d..a1f6cedc 100644 --- a/main.asm +++ b/main.asm @@ -29040,7 +29040,7 @@ WorldMapTileGraphics: ; 125a8 (4:65a8) 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) -- cgit v1.2.3 From 3ab1e25a51e0376e06fd92065d087fb8918428ea Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Mon, 19 Aug 2013 19:14:06 -0400 Subject: Added Red cycling sprite to gfx/sprites --- gfx/sprites/cycling.2bpp | Bin 0 -> 384 bytes main.asm | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) create mode 100755 gfx/sprites/cycling.2bpp diff --git a/gfx/sprites/cycling.2bpp b/gfx/sprites/cycling.2bpp new file mode 100755 index 00000000..7a92c2ba Binary files /dev/null and b/gfx/sprites/cycling.2bpp differ diff --git a/main.asm b/main.asm index a1f6cedc..d0a86a6e 100644 --- a/main.asm +++ b/main.asm @@ -31255,8 +31255,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) -- cgit v1.2.3 From 37455d9b76491402aaeb099099888fe05c6c7a7b Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Mon, 19 Aug 2013 19:59:13 -0400 Subject: Added emotion bubble tiles to gfx --- gfx/emotion_bubbles.2bpp | Bin 0 -> 200 bytes main.asm | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100755 gfx/emotion_bubbles.2bpp diff --git a/gfx/emotion_bubbles.2bpp b/gfx/emotion_bubbles.2bpp new file mode 100755 index 00000000..c8a13e2f Binary files /dev/null and b/gfx/emotion_bubbles.2bpp differ diff --git a/main.asm b/main.asm index d0a86a6e..a041b3a0 100644 --- a/main.asm +++ b/main.asm @@ -32387,7 +32387,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 +32400,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) -- cgit v1.2.3 From 52cc9d3e02fe4b4591c85949c8a6691764c5eea9 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Mon, 19 Aug 2013 21:58:05 -0400 Subject: Added trainer info border tiles to gfx --- gfx/trainer_info.2bpp | Bin 0 -> 144 bytes main.asm | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100755 gfx/trainer_info.2bpp diff --git a/gfx/trainer_info.2bpp b/gfx/trainer_info.2bpp new file mode 100755 index 00000000..4baf4888 Binary files /dev/null and b/gfx/trainer_info.2bpp differ diff --git a/main.asm b/main.asm index a041b3a0..79f00fb8 100644 --- a/main.asm +++ b/main.asm @@ -44737,7 +44737,7 @@ 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) -- cgit v1.2.3 From 838b430a6cecd50a62705af0a70387dc6226ab1e Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Mon, 19 Aug 2013 22:04:59 -0400 Subject: Added blank gym leader name tiles to gfx --- gfx/blank_leader_names.2bpp | Bin 0 -> 368 bytes main.asm | 10 +++++----- 2 files changed, 5 insertions(+), 5 deletions(-) create mode 100755 gfx/blank_leader_names.2bpp diff --git a/gfx/blank_leader_names.2bpp b/gfx/blank_leader_names.2bpp new file mode 100755 index 00000000..1eac2fae Binary files /dev/null and b/gfx/blank_leader_names.2bpp differ diff --git a/main.asm b/main.asm index 79f00fb8..8291a691 100644 --- a/main.asm +++ b/main.asm @@ -30505,7 +30505,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 @@ -44740,8 +44740,8 @@ TrainerInfoTextBoxTileGraphics: ; 2fb98 (b:7b98) 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 @@ -85905,10 +85905,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 -- cgit v1.2.3 From 8e844c85be2d9211425b0a6ffac676a9a480dffb Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Mon, 19 Aug 2013 23:23:58 -0400 Subject: Added badge number tiles to gfx --- gfx/badge_numbers.2bpp | Bin 0 -> 128 bytes main.asm | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100755 gfx/badge_numbers.2bpp diff --git a/gfx/badge_numbers.2bpp b/gfx/badge_numbers.2bpp new file mode 100755 index 00000000..664758aa Binary files /dev/null and b/gfx/badge_numbers.2bpp differ diff --git a/main.asm b/main.asm index 8291a691..07685aa9 100644 --- a/main.asm +++ b/main.asm @@ -44744,7 +44744,7 @@ 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) -- cgit v1.2.3 From f48ffcbec4849dcde8647dc4c0feaee36a12e352 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Mon, 19 Aug 2013 23:36:41 -0400 Subject: Added Pokeball tiles to gfx --- gfx/pokeball.2bpp | Bin 0 -> 64 bytes main.asm | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100755 gfx/pokeball.2bpp diff --git a/gfx/pokeball.2bpp b/gfx/pokeball.2bpp new file mode 100755 index 00000000..626c4e3e Binary files /dev/null and b/gfx/pokeball.2bpp differ diff --git a/main.asm b/main.asm index 07685aa9..459c82ae 100644 --- a/main.asm +++ b/main.asm @@ -53889,7 +53889,7 @@ 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) -- cgit v1.2.3 From 9387e9ab15eb4f45878d4aeb856ed93acbf2c379 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Mon, 19 Aug 2013 23:42:19 -0400 Subject: Added trading tiles to gfx --- gfx/trade.2bpp | Bin 0 -> 784 bytes main.asm | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100755 gfx/trade.2bpp diff --git a/gfx/trade.2bpp b/gfx/trade.2bpp new file mode 100755 index 00000000..e7c18503 Binary files /dev/null and b/gfx/trade.2bpp differ diff --git a/main.asm b/main.asm index 459c82ae..4c3937f8 100644 --- a/main.asm +++ b/main.asm @@ -53893,7 +53893,7 @@ 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) -- cgit v1.2.3 From 802337067e3cea0570b250b81c2234b949a8fea9 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Mon, 19 Aug 2013 23:44:36 -0400 Subject: Added trading wire transfer tiles to gfx --- gfx/trade2.2bpp | Bin 0 -> 64 bytes main.asm | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100755 gfx/trade2.2bpp diff --git a/gfx/trade2.2bpp b/gfx/trade2.2bpp new file mode 100755 index 00000000..975f4da0 Binary files /dev/null and b/gfx/trade2.2bpp differ diff --git a/main.asm b/main.asm index 4c3937f8..6bdb03f8 100644 --- a/main.asm +++ b/main.asm @@ -53897,7 +53897,7 @@ 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) -- cgit v1.2.3 From 54194adbe5a4bf363000e2508bd82dadda654ac8 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Tue, 20 Aug 2013 00:06:36 -0400 Subject: Added Gamefreak intro tiles to gfx --- gfx/gamefreak_intro.2bpp | Bin 0 -> 320 bytes main.asm | 12 ++++++------ 2 files changed, 6 insertions(+), 6 deletions(-) create mode 100755 gfx/gamefreak_intro.2bpp diff --git a/gfx/gamefreak_intro.2bpp b/gfx/gamefreak_intro.2bpp new file mode 100755 index 00000000..fed4d67f Binary files /dev/null and b/gfx/gamefreak_intro.2bpp differ diff --git a/main.asm b/main.asm index 6bdb03f8..bc9b1d01 100644 --- a/main.asm +++ b/main.asm @@ -68513,15 +68513,15 @@ Func_41852: ; 41852 (10:5852) ld bc, $600 ld a, BANK(Unknown_41a99) 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 de, $8000 @@ -68611,8 +68611,8 @@ 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 -- cgit v1.2.3 From 3aa3699bf088606f64d3427ccb49fc293418ccda Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Tue, 20 Aug 2013 00:17:31 -0400 Subject: Added intro fight tiles to gfx --- gfx/intro_fight.2bpp | Bin 0 -> 1536 bytes main.asm | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100755 gfx/intro_fight.2bpp diff --git a/gfx/intro_fight.2bpp b/gfx/intro_fight.2bpp new file mode 100755 index 00000000..5672e387 Binary files /dev/null and b/gfx/intro_fight.2bpp differ diff --git a/main.asm b/main.asm index bc9b1d01..abf0c72d 100644 --- a/main.asm +++ b/main.asm @@ -68508,10 +68508,10 @@ 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, GameFreakIntro ; $5959 ld de, $9600 @@ -68614,8 +68614,8 @@ INCBIN "baserom.gbc",$41950,$41959 - $41950 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 -- cgit v1.2.3 From 77c1b0dee906d1f9d0a3df8ce4566304e0d325db Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Tue, 20 Aug 2013 00:41:40 -0400 Subject: Fixed intro fight front sprite --- gfx/blue/introfight.2bpp | Bin 1680 -> 1744 bytes gfx/red/introfight.2bpp | Bin 1680 -> 1744 bytes main.asm | 7 +++---- 3 files changed, 3 insertions(+), 4 deletions(-) mode change 100644 => 100755 gfx/blue/introfight.2bpp mode change 100644 => 100755 gfx/red/introfight.2bpp diff --git a/gfx/blue/introfight.2bpp b/gfx/blue/introfight.2bpp old mode 100644 new mode 100755 index 76d7070a..4666bbf9 Binary files a/gfx/blue/introfight.2bpp and b/gfx/blue/introfight.2bpp differ diff --git a/gfx/red/introfight.2bpp b/gfx/red/introfight.2bpp old mode 100644 new mode 100755 index 62c20894..bbed4572 Binary files a/gfx/red/introfight.2bpp and b/gfx/red/introfight.2bpp differ diff --git a/main.asm b/main.asm index abf0c72d..c1151f91 100644 --- a/main.asm +++ b/main.asm @@ -68523,10 +68523,10 @@ Func_41852: ; 41852 (10:5852) ld bc, $140 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) @@ -68617,8 +68617,7 @@ INCBIN "gfx/gamefreak_intro.2bpp" 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" -- cgit v1.2.3 From 9ed645c5e3f3d9216690c18bbfb1467a3107e85c Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Tue, 20 Aug 2013 01:12:12 -0400 Subject: Added spinner animation tiles to gfx --- gfx/spinner_arrow.2bpp | Bin 0 -> 64 bytes main.asm | 38 +++++++++++++++++++------------------- 2 files changed, 19 insertions(+), 19 deletions(-) create mode 100755 gfx/spinner_arrow.2bpp diff --git a/gfx/spinner_arrow.2bpp b/gfx/spinner_arrow.2bpp new file mode 100755 index 00000000..5c0d27c6 Binary files /dev/null and b/gfx/spinner_arrow.2bpp differ diff --git a/main.asm b/main.asm index c1151f91..8f85af22 100644 --- a/main.asm +++ b/main.asm @@ -70139,24 +70139,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 @@ -70180,24 +70180,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 @@ -70223,9 +70223,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 -- cgit v1.2.3 From b03f63b07aa475d5eed30c427264eae0f796b785 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Tue, 20 Aug 2013 01:31:48 -0400 Subject: Added Pokecenter healing Pokeball tiles to gfx --- gfx/pokecenter_ball.2bpp | Bin 0 -> 32 bytes main.asm | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100755 gfx/pokecenter_ball.2bpp diff --git a/gfx/pokecenter_ball.2bpp b/gfx/pokecenter_ball.2bpp new file mode 100755 index 00000000..292f6954 Binary files /dev/null and b/gfx/pokecenter_ball.2bpp differ diff --git a/main.asm b/main.asm index 8f85af22..e53786a4 100644 --- a/main.asm +++ b/main.asm @@ -98788,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] @@ -98851,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 -- cgit v1.2.3 From a567e6b99923322eff2370c45d5da5c34d25fe23 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Tue, 20 Aug 2013 02:02:54 -0400 Subject: Added party menu/ow mon sprites to gfx --- gfx/mon_ow_sprites.2bpp | Bin 0 -> 384 bytes main.asm | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100755 gfx/mon_ow_sprites.2bpp diff --git a/gfx/mon_ow_sprites.2bpp b/gfx/mon_ow_sprites.2bpp new file mode 100755 index 00000000..b318eba5 Binary files /dev/null and b/gfx/mon_ow_sprites.2bpp differ diff --git a/main.asm b/main.asm index e53786a4..59b46894 100644 --- a/main.asm +++ b/main.asm @@ -101259,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 -- cgit v1.2.3 From b56c04c48cfaca1e06e5390b957a396489e6ad77 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Tue, 20 Aug 2013 02:19:11 -0400 Subject: Added attack animation tileset 1 to gfx --- gfx/attack_anim_1.2bpp | Bin 0 -> 1264 bytes main.asm | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100755 gfx/attack_anim_1.2bpp diff --git a/gfx/attack_anim_1.2bpp b/gfx/attack_anim_1.2bpp new file mode 100755 index 00000000..55dcfef5 Binary files /dev/null and b/gfx/attack_anim_1.2bpp differ diff --git a/main.asm b/main.asm index 59b46894..9f008199 100644 --- a/main.asm +++ b/main.asm @@ -108682,7 +108682,7 @@ 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 -- cgit v1.2.3 From 093b04db7aa6e746e570314e46344efff9c78676 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Tue, 20 Aug 2013 02:21:02 -0400 Subject: Added attack animation tileset 2 to gfx --- gfx/attack_anim_2.2bpp | Bin 0 -> 1264 bytes main.asm | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100755 gfx/attack_anim_2.2bpp diff --git a/gfx/attack_anim_2.2bpp b/gfx/attack_anim_2.2bpp new file mode 100755 index 00000000..51d87b27 Binary files /dev/null and b/gfx/attack_anim_2.2bpp differ diff --git a/main.asm b/main.asm index 9f008199..84cc12d2 100644 --- a/main.asm +++ b/main.asm @@ -108685,7 +108685,7 @@ AnimationTileset1: ; 781fe (1e:41fe) 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" -- cgit v1.2.3 From 95f895c23cf2091855728b55582235cb0b787e80 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Tue, 20 Aug 2013 02:46:00 -0400 Subject: Added fishing animation tiles to gfx --- gfx/red_fishing.2bpp | Bin 0 -> 160 bytes main.asm | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100755 gfx/red_fishing.2bpp diff --git a/gfx/red_fishing.2bpp b/gfx/red_fishing.2bpp new file mode 100755 index 00000000..11da1073 Binary files /dev/null and b/gfx/red_fishing.2bpp differ diff --git a/main.asm b/main.asm index 84cc12d2..675c86ad 100644 --- a/main.asm +++ b/main.asm @@ -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 -- cgit v1.2.3 From 6e64b53e74f077631e0c85c1a26dfdbfa461606d Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Tue, 20 Aug 2013 02:55:47 -0400 Subject: Added Town Map cursor to gfx --- gfx/town_map_cursor.1bpp | Bin 0 -> 32 bytes main.asm | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100755 gfx/town_map_cursor.1bpp diff --git a/gfx/town_map_cursor.1bpp b/gfx/town_map_cursor.1bpp new file mode 100755 index 00000000..46328979 Binary files /dev/null and b/gfx/town_map_cursor.1bpp differ diff --git a/main.asm b/main.asm index 675c86ad..c2ea1c18 100644 --- a/main.asm +++ b/main.asm @@ -100138,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 @@ -100227,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) -- cgit v1.2.3 From 70568d7684caba1d63f62921ff836ce93be02f93 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Tue, 20 Aug 2013 03:18:20 -0400 Subject: Added Town Map up arrow to gfx --- gfx/up_arrow.1bpp | Bin 0 -> 8 bytes main.asm | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100755 gfx/up_arrow.1bpp diff --git a/gfx/up_arrow.1bpp b/gfx/up_arrow.1bpp new file mode 100755 index 00000000..a3c69389 Binary files /dev/null and b/gfx/up_arrow.1bpp differ diff --git a/main.asm b/main.asm index c2ea1c18..d9442434 100644 --- a/main.asm +++ b/main.asm @@ -100267,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 @@ -100404,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) -- cgit v1.2.3 From 688c8dc9a5aced07315452591ca39f0ebfaa76d7 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Tue, 20 Aug 2013 03:33:21 -0400 Subject: Added Town Map rle file to gfx --- gfx/town_map.rle | Bin 0 -> 171 bytes main.asm | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100755 gfx/town_map.rle diff --git a/gfx/town_map.rle b/gfx/town_map.rle new file mode 100755 index 00000000..f9ede0ec Binary files /dev/null and b/gfx/town_map.rle differ diff --git a/main.asm b/main.asm index d9442434..2ce5fe6b 100644 --- a/main.asm +++ b/main.asm @@ -100460,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) -- cgit v1.2.3 From 03776462c361c85541b40208b8fc6efaac1565c8 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Tue, 20 Aug 2013 13:49:05 -0400 Subject: Add diagonal line tiles to gfx --- gfx/diagonal_lines.2bpp | Bin 0 -> 32 bytes main.asm | 8 +++++--- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100755 gfx/diagonal_lines.2bpp diff --git a/gfx/diagonal_lines.2bpp b/gfx/diagonal_lines.2bpp new file mode 100755 index 00000000..ed8d1e78 Binary files /dev/null and b/gfx/diagonal_lines.2bpp differ diff --git a/main.asm b/main.asm index 2ce5fe6b..ac4a983d 100644 --- a/main.asm +++ b/main.asm @@ -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) -- cgit v1.2.3 From c3c27371022bcbcd9da34f05a046f85ea692a400 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Tue, 20 Aug 2013 14:26:14 -0400 Subject: Delete useless incbin of free space --- main.asm | 2 -- 1 file changed, 2 deletions(-) diff --git a/main.asm b/main.asm index ac4a983d..20d1e844 100644 --- a/main.asm +++ b/main.asm @@ -72981,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) -- cgit v1.2.3 From 6fc179a10b28d38e9ee0e4bff7a31eb27962d77f Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Tue, 20 Aug 2013 14:56:20 -0400 Subject: Add falling star tile to gfx --- gfx/falling_star.2bpp | Bin 0 -> 16 bytes main.asm | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100755 gfx/falling_star.2bpp diff --git a/gfx/falling_star.2bpp b/gfx/falling_star.2bpp new file mode 100755 index 00000000..4cab94c8 Binary files /dev/null and b/gfx/falling_star.2bpp differ diff --git a/main.asm b/main.asm index 20d1e844..2a767001 100644 --- a/main.asm +++ b/main.asm @@ -98310,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 @@ -98466,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) -- cgit v1.2.3 From 4d63a8b88a3d40e151a576efdf833db6cdaf521d Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Tue, 20 Aug 2013 15:52:43 -0400 Subject: Add black battle transition tile to gfx --- gfx/battle_transition.2bpp | 1 + main.asm | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100755 gfx/battle_transition.2bpp 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/main.asm b/main.asm index 2a767001..cd440234 100644 --- a/main.asm +++ b/main.asm @@ -99587,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) -- cgit v1.2.3 From f6b159bce7ec0ebe59717b2e13c231f322c45521 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Tue, 20 Aug 2013 19:17:21 -0400 Subject: Add ledge hopping shadow tile to gfx --- gfx/ledge_hopping_shadow.1bpp | Bin 0 -> 8 bytes main.asm | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100755 gfx/ledge_hopping_shadow.1bpp diff --git a/gfx/ledge_hopping_shadow.1bpp b/gfx/ledge_hopping_shadow.1bpp new file mode 100755 index 00000000..61d484f2 Binary files /dev/null and b/gfx/ledge_hopping_shadow.1bpp differ diff --git a/main.asm b/main.asm index cd440234..44dc3e0e 100644 --- a/main.asm +++ b/main.asm @@ -36581,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 @@ -36590,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 -- cgit v1.2.3