From 80812bcb9544ae878dfc378d82816fe75420f8c7 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Fri, 16 Feb 2018 22:29:17 +0100 Subject: Reorganize some graphics --- src/constants/misc_constants.asm | 7 +- src/engine/bank1.asm | 57 +++++++++- src/engine/bank3.asm | 4 +- src/engine/home.asm | 26 ++--- src/gfx.asm | 126 ++++++++++----------- src/gfx/booster_packs/colosseum1.png | Bin 0 -> 1175 bytes src/gfx/booster_packs/colosseum2.t10.png | Bin 0 -> 1033 bytes src/gfx/booster_packs/evolution1.png | Bin 0 -> 1191 bytes src/gfx/booster_packs/evolution2.t10.png | Bin 0 -> 1068 bytes src/gfx/booster_packs/laboratory1.png | Bin 0 -> 1206 bytes src/gfx/booster_packs/laboratory2.t10.png | Bin 0 -> 1068 bytes src/gfx/booster_packs/mystery1.png | Bin 0 -> 1259 bytes src/gfx/booster_packs/mystery2.t10.png | Bin 0 -> 1136 bytes src/gfx/booster_packs/oam.png | Bin 0 -> 355 bytes src/gfx/boosterpacks/aerodactylintro1.png | Bin 1260 -> 0 bytes src/gfx/boosterpacks/aerodactylintro2.png | Bin 1259 -> 0 bytes src/gfx/boosterpacks/boosterpack_oam.png | Bin 355 -> 0 bytes src/gfx/boosterpacks/charizardintro1.png | Bin 1465 -> 0 bytes src/gfx/boosterpacks/charizardintro2.png | Bin 1482 -> 0 bytes src/gfx/boosterpacks/colosseum1.png | Bin 1175 -> 0 bytes src/gfx/boosterpacks/colosseum2.t10.png | Bin 1033 -> 0 bytes src/gfx/boosterpacks/evolution1.png | Bin 1191 -> 0 bytes src/gfx/boosterpacks/evolution2.t10.png | Bin 1068 -> 0 bytes src/gfx/boosterpacks/laboratory1.png | Bin 1206 -> 0 bytes src/gfx/boosterpacks/laboratory2.t10.png | Bin 1068 -> 0 bytes src/gfx/boosterpacks/mystery1.png | Bin 1259 -> 0 bytes src/gfx/boosterpacks/mystery2.t10.png | Bin 1136 -> 0 bytes src/gfx/boosterpacks/scytherintro1.png | Bin 1377 -> 0 bytes src/gfx/boosterpacks/scytherintro2.png | Bin 1375 -> 0 bytes src/gfx/cardpop/cardpop1.t3.png | Bin 0 -> 1452 bytes src/gfx/cardpop/cardpop2.t3.png | Bin 0 -> 803 bytes src/gfx/cardpop/cardpop3.t3.png | Bin 0 -> 784 bytes src/gfx/cardpop1.t3.png | Bin 1452 -> 0 bytes src/gfx/cardpop2.t3.png | Bin 803 -> 0 bytes src/gfx/cardpop3.t3.png | Bin 784 -> 0 bytes src/gfx/overworld_map_oam.png | Bin 0 -> 174 bytes src/gfx/overworld_sprites/0.png | Bin 0 -> 282 bytes src/gfx/overworld_sprites/1.png | Bin 0 -> 254 bytes src/gfx/overworld_sprites/10.png | Bin 0 -> 303 bytes src/gfx/overworld_sprites/11.png | Bin 0 -> 275 bytes src/gfx/overworld_sprites/12.png | Bin 0 -> 294 bytes src/gfx/overworld_sprites/13.png | Bin 0 -> 274 bytes src/gfx/overworld_sprites/14.png | Bin 0 -> 271 bytes src/gfx/overworld_sprites/15.png | Bin 0 -> 284 bytes src/gfx/overworld_sprites/16.png | Bin 0 -> 267 bytes src/gfx/overworld_sprites/17.png | Bin 0 -> 274 bytes src/gfx/overworld_sprites/18.png | Bin 0 -> 271 bytes src/gfx/overworld_sprites/19.png | Bin 0 -> 277 bytes src/gfx/overworld_sprites/2.png | Bin 0 -> 276 bytes src/gfx/overworld_sprites/20.png | Bin 0 -> 274 bytes src/gfx/overworld_sprites/21.png | Bin 0 -> 272 bytes src/gfx/overworld_sprites/22.png | Bin 0 -> 271 bytes src/gfx/overworld_sprites/23.png | Bin 0 -> 281 bytes src/gfx/overworld_sprites/24.png | Bin 0 -> 309 bytes src/gfx/overworld_sprites/25.png | Bin 0 -> 270 bytes src/gfx/overworld_sprites/26.png | Bin 0 -> 300 bytes src/gfx/overworld_sprites/27.png | Bin 0 -> 280 bytes src/gfx/overworld_sprites/28.png | Bin 0 -> 277 bytes src/gfx/overworld_sprites/29.png | Bin 0 -> 292 bytes src/gfx/overworld_sprites/3.png | Bin 0 -> 264 bytes src/gfx/overworld_sprites/30.png | Bin 0 -> 263 bytes src/gfx/overworld_sprites/31.png | Bin 0 -> 295 bytes src/gfx/overworld_sprites/32.png | Bin 0 -> 332 bytes src/gfx/overworld_sprites/4.png | Bin 0 -> 290 bytes src/gfx/overworld_sprites/5.png | Bin 0 -> 375 bytes src/gfx/overworld_sprites/6.png | Bin 0 -> 280 bytes src/gfx/overworld_sprites/7.png | Bin 0 -> 273 bytes src/gfx/overworld_sprites/8.png | Bin 0 -> 288 bytes src/gfx/overworld_sprites/9.png | Bin 0 -> 270 bytes src/gfx/overworld_sprites/doctormason.png | Bin 0 -> 288 bytes src/gfx/overworld_sprites/help_desk_lady.png | Bin 0 -> 184 bytes src/gfx/overworld_sprites/player.png | Bin 0 -> 323 bytes src/gfx/overworld_sprites/ronald.png | Bin 0 -> 272 bytes src/gfx/ow/doctormason.png | Bin 288 -> 0 bytes src/gfx/ow/help_desk_lady.png | Bin 184 -> 0 bytes src/gfx/ow/player.png | Bin 323 -> 0 bytes src/gfx/ow/ronald.png | Bin 272 -> 0 bytes src/gfx/ow/sprite0.png | Bin 282 -> 0 bytes src/gfx/ow/sprite1.png | Bin 254 -> 0 bytes src/gfx/ow/sprite10.png | Bin 303 -> 0 bytes src/gfx/ow/sprite11.png | Bin 275 -> 0 bytes src/gfx/ow/sprite12.png | Bin 294 -> 0 bytes src/gfx/ow/sprite13.png | Bin 274 -> 0 bytes src/gfx/ow/sprite14.png | Bin 271 -> 0 bytes src/gfx/ow/sprite15.png | Bin 284 -> 0 bytes src/gfx/ow/sprite16.png | Bin 267 -> 0 bytes src/gfx/ow/sprite17.png | Bin 274 -> 0 bytes src/gfx/ow/sprite18.png | Bin 271 -> 0 bytes src/gfx/ow/sprite19.png | Bin 277 -> 0 bytes src/gfx/ow/sprite2.png | Bin 276 -> 0 bytes src/gfx/ow/sprite20.png | Bin 274 -> 0 bytes src/gfx/ow/sprite21.png | Bin 272 -> 0 bytes src/gfx/ow/sprite22.png | Bin 271 -> 0 bytes src/gfx/ow/sprite23.png | Bin 281 -> 0 bytes src/gfx/ow/sprite24.png | Bin 309 -> 0 bytes src/gfx/ow/sprite25.png | Bin 270 -> 0 bytes src/gfx/ow/sprite26.png | Bin 300 -> 0 bytes src/gfx/ow/sprite27.png | Bin 280 -> 0 bytes src/gfx/ow/sprite28.png | Bin 277 -> 0 bytes src/gfx/ow/sprite29.png | Bin 292 -> 0 bytes src/gfx/ow/sprite3.png | Bin 264 -> 0 bytes src/gfx/ow/sprite30.png | Bin 263 -> 0 bytes src/gfx/ow/sprite31.png | Bin 295 -> 0 bytes src/gfx/ow/sprite32.png | Bin 332 -> 0 bytes src/gfx/ow/sprite4.png | Bin 290 -> 0 bytes src/gfx/ow/sprite5.png | Bin 375 -> 0 bytes src/gfx/ow/sprite6.png | Bin 280 -> 0 bytes src/gfx/ow/sprite7.png | Bin 273 -> 0 bytes src/gfx/ow/sprite8.png | Bin 288 -> 0 bytes src/gfx/ow/sprite9.png | Bin 270 -> 0 bytes src/gfx/ow_map_oam.png | Bin 174 -> 0 bytes .../titlescreen/booster_packs/aerodactylintro1.png | Bin 0 -> 1260 bytes .../titlescreen/booster_packs/aerodactylintro2.png | Bin 0 -> 1259 bytes .../titlescreen/booster_packs/charizardintro1.png | Bin 0 -> 1465 bytes .../titlescreen/booster_packs/charizardintro2.png | Bin 0 -> 1482 bytes .../titlescreen/booster_packs/scytherintro1.png | Bin 0 -> 1377 bytes .../titlescreen/booster_packs/scytherintro2.png | Bin 0 -> 1375 bytes src/gfx/titlescreen/colorless.png | Bin 123 -> 0 bytes src/gfx/titlescreen/energies/colorless.png | Bin 0 -> 123 bytes src/gfx/titlescreen/energies/fighting.png | Bin 0 -> 128 bytes src/gfx/titlescreen/energies/fire.png | Bin 0 -> 135 bytes src/gfx/titlescreen/energies/grass.png | Bin 0 -> 137 bytes src/gfx/titlescreen/energies/lightning.png | Bin 0 -> 131 bytes src/gfx/titlescreen/energies/psychic.png | Bin 0 -> 130 bytes src/gfx/titlescreen/energies/water.png | Bin 0 -> 126 bytes src/gfx/titlescreen/fighting.png | Bin 128 -> 0 bytes src/gfx/titlescreen/fire.png | Bin 135 -> 0 bytes src/gfx/titlescreen/grass.png | Bin 137 -> 0 bytes src/gfx/titlescreen/lightning.png | Bin 131 -> 0 bytes src/gfx/titlescreen/psychic.png | Bin 130 -> 0 bytes src/gfx/titlescreen/water.png | Bin 126 -> 0 bytes src/text/text1.asm | 2 +- src/text/text_offsets.asm | 2 +- 133 files changed, 137 insertions(+), 87 deletions(-) create mode 100644 src/gfx/booster_packs/colosseum1.png create mode 100644 src/gfx/booster_packs/colosseum2.t10.png create mode 100644 src/gfx/booster_packs/evolution1.png create mode 100644 src/gfx/booster_packs/evolution2.t10.png create mode 100644 src/gfx/booster_packs/laboratory1.png create mode 100644 src/gfx/booster_packs/laboratory2.t10.png create mode 100644 src/gfx/booster_packs/mystery1.png create mode 100644 src/gfx/booster_packs/mystery2.t10.png create mode 100644 src/gfx/booster_packs/oam.png delete mode 100755 src/gfx/boosterpacks/aerodactylintro1.png delete mode 100755 src/gfx/boosterpacks/aerodactylintro2.png delete mode 100755 src/gfx/boosterpacks/boosterpack_oam.png delete mode 100755 src/gfx/boosterpacks/charizardintro1.png delete mode 100755 src/gfx/boosterpacks/charizardintro2.png delete mode 100755 src/gfx/boosterpacks/colosseum1.png delete mode 100755 src/gfx/boosterpacks/colosseum2.t10.png delete mode 100755 src/gfx/boosterpacks/evolution1.png delete mode 100755 src/gfx/boosterpacks/evolution2.t10.png delete mode 100755 src/gfx/boosterpacks/laboratory1.png delete mode 100755 src/gfx/boosterpacks/laboratory2.t10.png delete mode 100755 src/gfx/boosterpacks/mystery1.png delete mode 100755 src/gfx/boosterpacks/mystery2.t10.png delete mode 100755 src/gfx/boosterpacks/scytherintro1.png delete mode 100755 src/gfx/boosterpacks/scytherintro2.png create mode 100644 src/gfx/cardpop/cardpop1.t3.png create mode 100644 src/gfx/cardpop/cardpop2.t3.png create mode 100644 src/gfx/cardpop/cardpop3.t3.png delete mode 100755 src/gfx/cardpop1.t3.png delete mode 100755 src/gfx/cardpop2.t3.png delete mode 100755 src/gfx/cardpop3.t3.png create mode 100644 src/gfx/overworld_map_oam.png create mode 100644 src/gfx/overworld_sprites/0.png create mode 100644 src/gfx/overworld_sprites/1.png create mode 100644 src/gfx/overworld_sprites/10.png create mode 100644 src/gfx/overworld_sprites/11.png create mode 100644 src/gfx/overworld_sprites/12.png create mode 100644 src/gfx/overworld_sprites/13.png create mode 100644 src/gfx/overworld_sprites/14.png create mode 100644 src/gfx/overworld_sprites/15.png create mode 100644 src/gfx/overworld_sprites/16.png create mode 100644 src/gfx/overworld_sprites/17.png create mode 100644 src/gfx/overworld_sprites/18.png create mode 100644 src/gfx/overworld_sprites/19.png create mode 100644 src/gfx/overworld_sprites/2.png create mode 100644 src/gfx/overworld_sprites/20.png create mode 100644 src/gfx/overworld_sprites/21.png create mode 100644 src/gfx/overworld_sprites/22.png create mode 100644 src/gfx/overworld_sprites/23.png create mode 100644 src/gfx/overworld_sprites/24.png create mode 100644 src/gfx/overworld_sprites/25.png create mode 100644 src/gfx/overworld_sprites/26.png create mode 100644 src/gfx/overworld_sprites/27.png create mode 100644 src/gfx/overworld_sprites/28.png create mode 100644 src/gfx/overworld_sprites/29.png create mode 100644 src/gfx/overworld_sprites/3.png create mode 100644 src/gfx/overworld_sprites/30.png create mode 100644 src/gfx/overworld_sprites/31.png create mode 100644 src/gfx/overworld_sprites/32.png create mode 100644 src/gfx/overworld_sprites/4.png create mode 100644 src/gfx/overworld_sprites/5.png create mode 100644 src/gfx/overworld_sprites/6.png create mode 100644 src/gfx/overworld_sprites/7.png create mode 100644 src/gfx/overworld_sprites/8.png create mode 100644 src/gfx/overworld_sprites/9.png create mode 100644 src/gfx/overworld_sprites/doctormason.png create mode 100644 src/gfx/overworld_sprites/help_desk_lady.png create mode 100644 src/gfx/overworld_sprites/player.png create mode 100644 src/gfx/overworld_sprites/ronald.png delete mode 100755 src/gfx/ow/doctormason.png delete mode 100755 src/gfx/ow/help_desk_lady.png delete mode 100755 src/gfx/ow/player.png delete mode 100755 src/gfx/ow/ronald.png delete mode 100755 src/gfx/ow/sprite0.png delete mode 100755 src/gfx/ow/sprite1.png delete mode 100755 src/gfx/ow/sprite10.png delete mode 100755 src/gfx/ow/sprite11.png delete mode 100755 src/gfx/ow/sprite12.png delete mode 100755 src/gfx/ow/sprite13.png delete mode 100755 src/gfx/ow/sprite14.png delete mode 100755 src/gfx/ow/sprite15.png delete mode 100755 src/gfx/ow/sprite16.png delete mode 100755 src/gfx/ow/sprite17.png delete mode 100755 src/gfx/ow/sprite18.png delete mode 100755 src/gfx/ow/sprite19.png delete mode 100755 src/gfx/ow/sprite2.png delete mode 100755 src/gfx/ow/sprite20.png delete mode 100755 src/gfx/ow/sprite21.png delete mode 100755 src/gfx/ow/sprite22.png delete mode 100755 src/gfx/ow/sprite23.png delete mode 100755 src/gfx/ow/sprite24.png delete mode 100755 src/gfx/ow/sprite25.png delete mode 100755 src/gfx/ow/sprite26.png delete mode 100755 src/gfx/ow/sprite27.png delete mode 100755 src/gfx/ow/sprite28.png delete mode 100755 src/gfx/ow/sprite29.png delete mode 100755 src/gfx/ow/sprite3.png delete mode 100755 src/gfx/ow/sprite30.png delete mode 100755 src/gfx/ow/sprite31.png delete mode 100755 src/gfx/ow/sprite32.png delete mode 100755 src/gfx/ow/sprite4.png delete mode 100755 src/gfx/ow/sprite5.png delete mode 100755 src/gfx/ow/sprite6.png delete mode 100755 src/gfx/ow/sprite7.png delete mode 100755 src/gfx/ow/sprite8.png delete mode 100755 src/gfx/ow/sprite9.png delete mode 100755 src/gfx/ow_map_oam.png create mode 100644 src/gfx/titlescreen/booster_packs/aerodactylintro1.png create mode 100644 src/gfx/titlescreen/booster_packs/aerodactylintro2.png create mode 100644 src/gfx/titlescreen/booster_packs/charizardintro1.png create mode 100644 src/gfx/titlescreen/booster_packs/charizardintro2.png create mode 100644 src/gfx/titlescreen/booster_packs/scytherintro1.png create mode 100644 src/gfx/titlescreen/booster_packs/scytherintro2.png delete mode 100755 src/gfx/titlescreen/colorless.png create mode 100644 src/gfx/titlescreen/energies/colorless.png create mode 100644 src/gfx/titlescreen/energies/fighting.png create mode 100644 src/gfx/titlescreen/energies/fire.png create mode 100644 src/gfx/titlescreen/energies/grass.png create mode 100644 src/gfx/titlescreen/energies/lightning.png create mode 100644 src/gfx/titlescreen/energies/psychic.png create mode 100644 src/gfx/titlescreen/energies/water.png delete mode 100755 src/gfx/titlescreen/fighting.png delete mode 100755 src/gfx/titlescreen/fire.png delete mode 100755 src/gfx/titlescreen/grass.png delete mode 100755 src/gfx/titlescreen/lightning.png delete mode 100755 src/gfx/titlescreen/psychic.png delete mode 100755 src/gfx/titlescreen/water.png diff --git a/src/constants/misc_constants.asm b/src/constants/misc_constants.asm index 18bf014..50bb03c 100644 --- a/src/constants/misc_constants.asm +++ b/src/constants/misc_constants.asm @@ -6,8 +6,11 @@ SCREEN_HEIGHT EQU 18 ; tiles BG_MAP_WIDTH EQU 32 ; tiles BG_MAP_HEIGHT EQU 32 ; tiles -; palettes -CGB_PAL_SIZE EQU 8 +; cgb palette size +CGB_PAL_SIZE EQU 8 ; bytes + +; tile size +TILE_SIZE EQU 16 ; bytes ; console types (for wConsole) CONSOLE_DMG EQU $00 diff --git a/src/engine/bank1.asm b/src/engine/bank1.asm index 2d9e6f9..985418b 100755 --- a/src/engine/bank1.asm +++ b/src/engine/bank1.asm @@ -1,4 +1,5 @@ -Func_4000: ; 4000 (1:4000) +; continuation of Bank0 Start +Start_Cont: ; 4000 (1:4000) di ld sp, $e000 call ResetSerial @@ -18,7 +19,7 @@ Func_4000: ; 4000 (1:4000) cp A_BUTTON | B_BUTTON jr z, .ask_erase_backup_ram farcall Func_126d1 - jr Func_4000 + jr Start_Cont .ask_erase_backup_ram call Func_405a call Func_04a2 @@ -40,10 +41,43 @@ Func_4050: ; 4050 (1:4050) ret Func_405a: ; 405a (1:405a) - INCROM $405a, $406f + xor a + ld [wTileMapFill], a + call DisableLCD + call Func_2119 + call Func_5aeb + ld de, $387f + call Func_2275 + ret +; 0x406e + +CommentedOut_406e: ; 406e (1:406e) + ret +; 0x406f Func_406f: ; 406f (1:406f) - INCROM $406f, $409f + call $420b + call $66e9 + ldtx hl, BackUpIsBrokenText + jr c, .asm_4097 + ld hl, sp+$00 + ld a, l + ld [wcbe5], a + ld a, h + ld [wcbe6], a + call ClearJoypad + ld a, [wDuelTheme] + call PlaySong + xor a + ld [wDuelFinished], a + call Func_426d + jp StartDuel.asm_40fb +.asm_4097 + call DrawWideTextBox_WaitForInput + call ResetSerial + scf + ret +; 0x409f ; this function begins the duel after the opponent's ; graphics, name and deck have been introduced @@ -92,6 +126,8 @@ StartDuel: ; 409f (1:409f) call HandleSwordsDanceOrFocusEnergySubstatus call $54c8 call HandleTurn + +.asm_40fb call Func_0f58 ld a, [wDuelFinished] or a @@ -232,7 +268,18 @@ StartDuel: ; 409f (1:409f) ret ; 0x420b - INCROM $420b, $4225 +Func_420b: ; 420b (1:420b) + xor a + ld [wTileMapFill], a + call $5990 + call Func_04a2 + call Func_2119 + call Func_5aeb + ld de, $389f + call Func_2275 + call EnableLCD + ret +; 0x4225 HandleTurn: ; 4225 (1:4225) ld a, DUELVARS_DUELIST_TYPE diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm index dd8638b..68fb245 100755 --- a/src/engine/bank3.asm +++ b/src/engine/bank3.asm @@ -83,9 +83,9 @@ Func_c0ce: ; c0ce (3:40ce) ld a, [wd0bf] res 7, a rlca - add PointerTable_c0e0 & $ff + add LOW(PointerTable_c0e0) ld l, a - ld a, PointerTable_c0e0 >> $8 + ld a, HIGH(PointerTable_c0e0) adc $0 ld h, a ld a, [hli] diff --git a/src/engine/home.asm b/src/engine/home.asm index ebffefa..78e32ae 100755 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -61,10 +61,10 @@ Start: ; 0150 (0:0150) call ResetSerial call CopyDMAFunction call SetupExtRAM - ld a, BANK(Func_4000) + ld a, BANK(Start_Cont) call BankswitchHome ld sp, $e000 - jp Func_4000 + jp Start_Cont VBlankHandler: ; 019b (0:019b) push af @@ -627,10 +627,10 @@ Func_04a2: ; 04a2 (0:04a2) ld a, [wConsole] cp CONSOLE_SGB ret nz - call EnableLCD ; - ld hl, AttrBlkPacket_04bf ; send SGB data - call SendSGB ; - call DisableLCD ; + call EnableLCD + ld hl, AttrBlkPacket_04bf + call SendSGB + call DisableLCD ret AttrBlkPacket_04bf: ; 04bf (0:04bf) @@ -2069,7 +2069,7 @@ SerialHandleRecv: ; 0d77 (0:0d77) dec e jr z, .last_was_ca cp $ac - ret z ; return if read_data == $ac + ret z ; return if read_data == $ac cp $ca jr z, .read_ca or a @@ -2081,7 +2081,7 @@ SerialHandleRecv: ; 0d77 (0:0d77) set 6, [hl] ret .read_ca - inc [hl] ; inc [wSerialLastReadCA] + inc [hl] ; inc [wSerialLastReadCA] ret .last_was_ca ; if last byte read was $ca, flip all bits of data received @@ -4350,13 +4350,13 @@ Func_210f: ; 210f (0:210f) jr asm_2121 Func_2119: ; 2119 (0:2119) - ld hl, DuelGraphics - Fonts + ld hl, DuelGraphics - $4000 ld de, vTiles2 ; destination ld b, $38 ; number of tiles asm_2121 - ld a, BANK(Fonts) + ld a, BANK(DuelGraphics) call BankpushHome - ld c, $10 + ld c, TILE_SIZE call CopyGfxData call BankpopHome ret @@ -4707,7 +4707,7 @@ Func_235e: ; 235e (0:235e) ld b, $c9 ld a, l ld [bc], a ; prev[i0] ← i - ldh [$ffa9], a ; [$ffa9] ← i (update linked-list head) + ldh [$ffa9], a ; [$ffa9] ← i (update linked-list head) ld h, $c9 ld b, [hl] ld [hl], $0 ; prev[i] ← 0 @@ -6173,7 +6173,7 @@ LoadCardGfx: ; 2fa0 (0:2fa0) Func_2fcb: ; 2fcb (0:2fcb) ld a, $1d call BankpushHome - ld c, $10 + ld c, TILE_SIZE call CopyGfxData call BankpopHome ret diff --git a/src/gfx.asm b/src/gfx.asm index dc7f9b9..71c6934 100644 --- a/src/gfx.asm +++ b/src/gfx.asm @@ -85,7 +85,7 @@ GrassClubTilesetGfx: ; 8b91e (22:791e) OWSpritePlayer: ; 8be90 (22:7e90) dw $14 - INCBIN "gfx/ow/player.2bpp" + INCBIN "gfx/overworld_sprites/player.2bpp" Unnamed3Gfx: ; 8bfd2 (22:7fd2) dw $1 @@ -160,39 +160,39 @@ PoisonGfx: ; 8ffa4 (23:7fa4) SECTION "Gfx 6", ROMX CardPop1Gfx: ; 90000 (24:4000) dw $bd - INCBIN "gfx/cardpop1.t3.2bpp" + INCBIN "gfx/cardpop/cardpop1.t3.2bpp" CardPop2Gfx: ; 90bd2 (24:4bd2) dw $6d - INCBIN "gfx/cardpop2.t3.2bpp" + INCBIN "gfx/cardpop/cardpop2.t3.2bpp" CardPop3Gfx: ; 912a4 (24:52a4) dw $5d - INCBIN "gfx/cardpop3.t3.2bpp" + INCBIN "gfx/cardpop/cardpop3.t3.2bpp" Colosseum1Gfx: ; 91876 (24:5876) dw $60 - INCBIN "gfx/boosterpacks/colosseum1.2bpp" + INCBIN "gfx/booster_packs/colosseum1.2bpp" Colosseum2Gfx: ; 91e78 (24:5e78) dw $56 - INCBIN "gfx/boosterpacks/colosseum2.t10.2bpp" + INCBIN "gfx/booster_packs/colosseum2.t10.2bpp" Evolution1Gfx: ; 923da (24:63da) dw $60 - INCBIN "gfx/boosterpacks/evolution1.2bpp" + INCBIN "gfx/booster_packs/evolution1.2bpp" Evolution2Gfx: ; 929dc (24:69dc) dw $56 - INCBIN "gfx/boosterpacks/evolution2.t10.2bpp" + INCBIN "gfx/booster_packs/evolution2.t10.2bpp" Mystery1Gfx: ; 92f3e (24:6f3e) dw $60 - INCBIN "gfx/boosterpacks/mystery1.2bpp" + INCBIN "gfx/booster_packs/mystery1.2bpp" Mystery2Gfx: ; 93540 (24:7540) dw $56 - INCBIN "gfx/boosterpacks/mystery2.t10.2bpp" + INCBIN "gfx/booster_packs/mystery2.t10.2bpp" RonaldGfx: ; 93aa2 (24:7aa2) dw $24 @@ -204,7 +204,7 @@ CopyrightGfx: ; 93ce4 (24:7ce4) HelpDeskLadyGfx: ; 93f26 (24:7f26) dw $8 - INCBIN "gfx/ow/help_desk_lady.2bpp" + INCBIN "gfx/overworld_sprites/help_desk_lady.2bpp" Unnamed4Gfx: ; 93fa8 (24:7fa8) dw $3 @@ -221,35 +221,35 @@ endr SECTION "Gfx 7", ROMX Laboratory1Gfx: ; 94000 (25:4000) dw $60 - INCBIN "gfx/boosterpacks/laboratory1.2bpp" + INCBIN "gfx/booster_packs/laboratory1.2bpp" Laboratory2Gfx: ; 94602 (25:4602) dw $56 - INCBIN "gfx/boosterpacks/laboratory2.t10.2bpp" + INCBIN "gfx/booster_packs/laboratory2.t10.2bpp" CharizardIntro1Gfx: ; 94b64 (25:4b64) dw $60 - INCBIN "gfx/boosterpacks/charizardintro1.2bpp" + INCBIN "gfx/titlescreen/booster_packs/charizardintro1.2bpp" CharizardIntro2Gfx: ; 95166 (25:5166) dw $60 - INCBIN "gfx/boosterpacks/charizardintro2.2bpp" + INCBIN "gfx/titlescreen/booster_packs/charizardintro2.2bpp" ScytherIntro1Gfx: ; 95768 (25:5768) dw $60 - INCBIN "gfx/boosterpacks/scytherintro1.2bpp" + INCBIN "gfx/titlescreen/booster_packs/scytherintro1.2bpp" ScytherIntro2Gfx: ; 95d6a (25:5d6a) dw $60 - INCBIN "gfx/boosterpacks/scytherintro2.2bpp" + INCBIN "gfx/titlescreen/booster_packs/scytherintro2.2bpp" AerodactylIntro1Gfx: ; 9636c (25:636c) dw $60 - INCBIN "gfx/boosterpacks/aerodactylintro1.2bpp" + INCBIN "gfx/titlescreen/booster_packs/aerodactylintro1.2bpp" AerodactylIntro2Gfx: ; 9696e (25:696e) dw $60 - INCBIN "gfx/boosterpacks/aerodactylintro2.2bpp" + INCBIN "gfx/titlescreen/booster_packs/aerodactylintro2.2bpp" Titlescreen1Gfx: ; 96f70 (25:6f70) dw $61 @@ -265,7 +265,7 @@ CompaniesGfx: ; 97b94 (25:7b94) RonaldOWGfx: ; 97ea6 (25:7ea6) dw $14 - INCBIN "gfx/ow/ronald.2bpp" + INCBIN "gfx/overworld_sprites/ronald.2bpp" INCROM $97fe8, $98000 @@ -288,11 +288,11 @@ Titlescreen6Gfx: ; 9b0b6 (26:70b6) DoctorMasonOWGfx: ; 9bdf8 (26:7df8) dw $14 - INCBIN "gfx/ow/doctormason.2bpp" + INCBIN "gfx/overworld_sprites/doctormason.2bpp" OverworldMapOAMGfx: ; 9bf3a (26:7f3a) dw $8 - INCBIN "gfx/ow_map_oam.2bpp" + INCBIN "gfx/overworld_map_oam.2bpp" Unnamed6Gfx: ; 9bfbc (26:7fbc) dw $3 @@ -474,123 +474,123 @@ AaronGfx: ; a1694 (28:5694) OWSprite0: ; a18d6 (28:58d6) dw $14 - INCBIN "gfx/ow/sprite0.2bpp" + INCBIN "gfx/overworld_sprites/0.2bpp" OWSprite1: ; a1a18 (28:5a18) dw $14 - INCBIN "gfx/ow/sprite1.2bpp" + INCBIN "gfx/overworld_sprites/1.2bpp" OWSprite2: ; a1b5a (28:5b5a) dw $14 - INCBIN "gfx/ow/sprite2.2bpp" + INCBIN "gfx/overworld_sprites/2.2bpp" OWSprite3: ; a1c9c (28:5c9c) dw $14 - INCBIN "gfx/ow/sprite3.2bpp" + INCBIN "gfx/overworld_sprites/3.2bpp" OWSprite4: ; a1dde (28:5dde) dw $14 - INCBIN "gfx/ow/sprite4.2bpp" + INCBIN "gfx/overworld_sprites/4.2bpp" OWSprite5: ; a1f20 (28:5f20) dw $1b - INCBIN "gfx/ow/sprite5.2bpp" + INCBIN "gfx/overworld_sprites/5.2bpp" OWSprite6: ; a20d2 (28:60d2) dw $14 - INCBIN "gfx/ow/sprite6.2bpp" + INCBIN "gfx/overworld_sprites/6.2bpp" OWSprite7: ; a2214 (28:6214) dw $14 - INCBIN "gfx/ow/sprite7.2bpp" + INCBIN "gfx/overworld_sprites/7.2bpp" OWSprite8: ; a2356 (28:6356) dw $14 - INCBIN "gfx/ow/sprite8.2bpp" + INCBIN "gfx/overworld_sprites/8.2bpp" OWSprite9: ; a2498 (28:6498) dw $14 - INCBIN "gfx/ow/sprite9.2bpp" + INCBIN "gfx/overworld_sprites/9.2bpp" OWSprite10: ; a25da (28:65da) dw $14 - INCBIN "gfx/ow/sprite10.2bpp" + INCBIN "gfx/overworld_sprites/10.2bpp" OWSprite11: ; a271c (28:671c) dw $14 - INCBIN "gfx/ow/sprite11.2bpp" + INCBIN "gfx/overworld_sprites/11.2bpp" OWSprite12: ; a285e (28:685e) dw $14 - INCBIN "gfx/ow/sprite12.2bpp" + INCBIN "gfx/overworld_sprites/12.2bpp" OWSprite13: ; a29a0 (28:69a0) dw $14 - INCBIN "gfx/ow/sprite13.2bpp" + INCBIN "gfx/overworld_sprites/13.2bpp" OWSprite14: ; a2ae2 (28:6ae2) dw $14 - INCBIN "gfx/ow/sprite14.2bpp" + INCBIN "gfx/overworld_sprites/14.2bpp" OWSprite15: ; a2c24 (28:6c24) dw $14 - INCBIN "gfx/ow/sprite15.2bpp" + INCBIN "gfx/overworld_sprites/15.2bpp" OWSprite16: ; a2d66 (28:6d66) dw $14 - INCBIN "gfx/ow/sprite16.2bpp" + INCBIN "gfx/overworld_sprites/16.2bpp" OWSprite17: ; a2ea8 (28:6ea8) dw $14 - INCBIN "gfx/ow/sprite17.2bpp" + INCBIN "gfx/overworld_sprites/17.2bpp" OWSprite18: ; a2fea (28:6fea) dw $14 - INCBIN "gfx/ow/sprite18.2bpp" + INCBIN "gfx/overworld_sprites/18.2bpp" OWSprite19: ; a312c (28:712c) dw $14 - INCBIN "gfx/ow/sprite19.2bpp" + INCBIN "gfx/overworld_sprites/19.2bpp" OWSprite20: ; a326e (28:726e) dw $14 - INCBIN "gfx/ow/sprite20.2bpp" + INCBIN "gfx/overworld_sprites/20.2bpp" OWSprite21: ; a33b0 (28:73b0) dw $14 - INCBIN "gfx/ow/sprite21.2bpp" + INCBIN "gfx/overworld_sprites/21.2bpp" OWSprite22: ; a34f2 (28:74f2) dw $14 - INCBIN "gfx/ow/sprite22.2bpp" + INCBIN "gfx/overworld_sprites/22.2bpp" OWSprite23: ; a3634 (28:7634) dw $14 - INCBIN "gfx/ow/sprite23.2bpp" + INCBIN "gfx/overworld_sprites/23.2bpp" OWSprite24: ; a3776 (28:7776) dw $14 - INCBIN "gfx/ow/sprite24.2bpp" + INCBIN "gfx/overworld_sprites/24.2bpp" OWSprite25: ; a38b8 (28:78b8) dw $14 - INCBIN "gfx/ow/sprite25.2bpp" + INCBIN "gfx/overworld_sprites/25.2bpp" OWSprite26: ; a39fa (28:79fa) dw $14 - INCBIN "gfx/ow/sprite26.2bpp" + INCBIN "gfx/overworld_sprites/26.2bpp" OWSprite27: ; a3b3c (28:7b3c) dw $14 - INCBIN "gfx/ow/sprite27.2bpp" + INCBIN "gfx/overworld_sprites/27.2bpp" OWSprite28: ; a3c7e (28:7c7e) dw $14 - INCBIN "gfx/ow/sprite28.2bpp" + INCBIN "gfx/overworld_sprites/28.2bpp" OWSprite29: ; a3dc0 (28:7dc0) dw $14 - INCBIN "gfx/ow/sprite29.2bpp" + INCBIN "gfx/overworld_sprites/29.2bpp" Unnamed10Gfx: ; a3f02 (28:7f02) dw $b @@ -605,15 +605,15 @@ Unnamed11Gfx: ; a3fb4 (28:7fb4) SECTION "Gfx 11", ROMX OWSprite30: ; a4000 (29:4000) dw $14 - INCBIN "gfx/ow/sprite30.2bpp" + INCBIN "gfx/overworld_sprites/30.2bpp" OWSprite31: ; a4142 (29:4142) dw $14 - INCBIN "gfx/ow/sprite31.2bpp" + INCBIN "gfx/overworld_sprites/31.2bpp" OWSprite32: ; a4284 (29:4284) dw $14 - INCBIN "gfx/ow/sprite32.2bpp" + INCBIN "gfx/overworld_sprites/32.2bpp" Duel0Gfx: ; a43c6 (29:43c6) dw $16 @@ -840,7 +840,7 @@ Duel54Gfx: ; a87e0 (2a:47e0) BoosterPackOAMGfx: ; a8942 (2a:4942) dw $20 - INCBIN "gfx/boosterpacks/boosterpack_oam.2bpp" + INCBIN "gfx/booster_packs/oam.2bpp" PressStartGfx: ; a8b44 (2a:4b44) dw $14 @@ -848,31 +848,31 @@ PressStartGfx: ; a8b44 (2a:4b44) GrassGfx: ; a8c86 (2a:4c86) dw $04 - INCBIN "gfx/titlescreen/grass.2bpp" + INCBIN "gfx/titlescreen/energies/grass.2bpp" FireGfx: ; a8cc8 (2a:4cc8) dw $04 - INCBIN "gfx/titlescreen/fire.2bpp" + INCBIN "gfx/titlescreen/energies/fire.2bpp" WaterGfx: ; a8d0a (2a:4d0a) dw $04 - INCBIN "gfx/titlescreen/water.2bpp" + INCBIN "gfx/titlescreen/energies/water.2bpp" ColorlessGfx: ; a8d4c (2a:4d4c) dw $04 - INCBIN "gfx/titlescreen/colorless.2bpp" + INCBIN "gfx/titlescreen/energies/colorless.2bpp" LightningGfx: ; a8d8e (2a:4d8e) dw $04 - INCBIN "gfx/titlescreen/lightning.2bpp" + INCBIN "gfx/titlescreen/energies/lightning.2bpp" PsychicGfx: ; a8dd0 (2a:4dd0) dw $04 - INCBIN "gfx/titlescreen/psychic.2bpp" + INCBIN "gfx/titlescreen/energies/psychic.2bpp" FightingGfx: ; a8e12 (2a:4e12) dw $04 - INCBIN "gfx/titlescreen/fighting.2bpp" + INCBIN "gfx/titlescreen/energies/fighting.2bpp" INCROM $a8e54, $ac000 diff --git a/src/gfx/booster_packs/colosseum1.png b/src/gfx/booster_packs/colosseum1.png new file mode 100644 index 0000000..9ce2500 Binary files /dev/null and b/src/gfx/booster_packs/colosseum1.png differ diff --git a/src/gfx/booster_packs/colosseum2.t10.png b/src/gfx/booster_packs/colosseum2.t10.png new file mode 100644 index 0000000..1da1a52 Binary files /dev/null and b/src/gfx/booster_packs/colosseum2.t10.png differ diff --git a/src/gfx/booster_packs/evolution1.png b/src/gfx/booster_packs/evolution1.png new file mode 100644 index 0000000..15caac5 Binary files /dev/null and b/src/gfx/booster_packs/evolution1.png differ diff --git a/src/gfx/booster_packs/evolution2.t10.png b/src/gfx/booster_packs/evolution2.t10.png new file mode 100644 index 0000000..09affa5 Binary files /dev/null and b/src/gfx/booster_packs/evolution2.t10.png differ diff --git a/src/gfx/booster_packs/laboratory1.png b/src/gfx/booster_packs/laboratory1.png new file mode 100644 index 0000000..5444be5 Binary files /dev/null and b/src/gfx/booster_packs/laboratory1.png differ diff --git a/src/gfx/booster_packs/laboratory2.t10.png b/src/gfx/booster_packs/laboratory2.t10.png new file mode 100644 index 0000000..4feb880 Binary files /dev/null and b/src/gfx/booster_packs/laboratory2.t10.png differ diff --git a/src/gfx/booster_packs/mystery1.png b/src/gfx/booster_packs/mystery1.png new file mode 100644 index 0000000..06a5749 Binary files /dev/null and b/src/gfx/booster_packs/mystery1.png differ diff --git a/src/gfx/booster_packs/mystery2.t10.png b/src/gfx/booster_packs/mystery2.t10.png new file mode 100644 index 0000000..fc04dbf Binary files /dev/null and b/src/gfx/booster_packs/mystery2.t10.png differ diff --git a/src/gfx/booster_packs/oam.png b/src/gfx/booster_packs/oam.png new file mode 100644 index 0000000..dcb3850 Binary files /dev/null and b/src/gfx/booster_packs/oam.png differ diff --git a/src/gfx/boosterpacks/aerodactylintro1.png b/src/gfx/boosterpacks/aerodactylintro1.png deleted file mode 100755 index e18b96b..0000000 Binary files a/src/gfx/boosterpacks/aerodactylintro1.png and /dev/null differ diff --git a/src/gfx/boosterpacks/aerodactylintro2.png b/src/gfx/boosterpacks/aerodactylintro2.png deleted file mode 100755 index ba347b5..0000000 Binary files a/src/gfx/boosterpacks/aerodactylintro2.png and /dev/null differ diff --git a/src/gfx/boosterpacks/boosterpack_oam.png b/src/gfx/boosterpacks/boosterpack_oam.png deleted file mode 100755 index dcb3850..0000000 Binary files a/src/gfx/boosterpacks/boosterpack_oam.png and /dev/null differ diff --git a/src/gfx/boosterpacks/charizardintro1.png b/src/gfx/boosterpacks/charizardintro1.png deleted file mode 100755 index 50e757f..0000000 Binary files a/src/gfx/boosterpacks/charizardintro1.png and /dev/null differ diff --git a/src/gfx/boosterpacks/charizardintro2.png b/src/gfx/boosterpacks/charizardintro2.png deleted file mode 100755 index c7ec7b4..0000000 Binary files a/src/gfx/boosterpacks/charizardintro2.png and /dev/null differ diff --git a/src/gfx/boosterpacks/colosseum1.png b/src/gfx/boosterpacks/colosseum1.png deleted file mode 100755 index 9ce2500..0000000 Binary files a/src/gfx/boosterpacks/colosseum1.png and /dev/null differ diff --git a/src/gfx/boosterpacks/colosseum2.t10.png b/src/gfx/boosterpacks/colosseum2.t10.png deleted file mode 100755 index 1da1a52..0000000 Binary files a/src/gfx/boosterpacks/colosseum2.t10.png and /dev/null differ diff --git a/src/gfx/boosterpacks/evolution1.png b/src/gfx/boosterpacks/evolution1.png deleted file mode 100755 index 15caac5..0000000 Binary files a/src/gfx/boosterpacks/evolution1.png and /dev/null differ diff --git a/src/gfx/boosterpacks/evolution2.t10.png b/src/gfx/boosterpacks/evolution2.t10.png deleted file mode 100755 index 09affa5..0000000 Binary files a/src/gfx/boosterpacks/evolution2.t10.png and /dev/null differ diff --git a/src/gfx/boosterpacks/laboratory1.png b/src/gfx/boosterpacks/laboratory1.png deleted file mode 100755 index 5444be5..0000000 Binary files a/src/gfx/boosterpacks/laboratory1.png and /dev/null differ diff --git a/src/gfx/boosterpacks/laboratory2.t10.png b/src/gfx/boosterpacks/laboratory2.t10.png deleted file mode 100755 index 4feb880..0000000 Binary files a/src/gfx/boosterpacks/laboratory2.t10.png and /dev/null differ diff --git a/src/gfx/boosterpacks/mystery1.png b/src/gfx/boosterpacks/mystery1.png deleted file mode 100755 index 06a5749..0000000 Binary files a/src/gfx/boosterpacks/mystery1.png and /dev/null differ diff --git a/src/gfx/boosterpacks/mystery2.t10.png b/src/gfx/boosterpacks/mystery2.t10.png deleted file mode 100755 index fc04dbf..0000000 Binary files a/src/gfx/boosterpacks/mystery2.t10.png and /dev/null differ diff --git a/src/gfx/boosterpacks/scytherintro1.png b/src/gfx/boosterpacks/scytherintro1.png deleted file mode 100755 index 3e6bd36..0000000 Binary files a/src/gfx/boosterpacks/scytherintro1.png and /dev/null differ diff --git a/src/gfx/boosterpacks/scytherintro2.png b/src/gfx/boosterpacks/scytherintro2.png deleted file mode 100755 index c6fd814..0000000 Binary files a/src/gfx/boosterpacks/scytherintro2.png and /dev/null differ diff --git a/src/gfx/cardpop/cardpop1.t3.png b/src/gfx/cardpop/cardpop1.t3.png new file mode 100644 index 0000000..c607d8d Binary files /dev/null and b/src/gfx/cardpop/cardpop1.t3.png differ diff --git a/src/gfx/cardpop/cardpop2.t3.png b/src/gfx/cardpop/cardpop2.t3.png new file mode 100644 index 0000000..75e5149 Binary files /dev/null and b/src/gfx/cardpop/cardpop2.t3.png differ diff --git a/src/gfx/cardpop/cardpop3.t3.png b/src/gfx/cardpop/cardpop3.t3.png new file mode 100644 index 0000000..48bd233 Binary files /dev/null and b/src/gfx/cardpop/cardpop3.t3.png differ diff --git a/src/gfx/cardpop1.t3.png b/src/gfx/cardpop1.t3.png deleted file mode 100755 index c607d8d..0000000 Binary files a/src/gfx/cardpop1.t3.png and /dev/null differ diff --git a/src/gfx/cardpop2.t3.png b/src/gfx/cardpop2.t3.png deleted file mode 100755 index 75e5149..0000000 Binary files a/src/gfx/cardpop2.t3.png and /dev/null differ diff --git a/src/gfx/cardpop3.t3.png b/src/gfx/cardpop3.t3.png deleted file mode 100755 index 48bd233..0000000 Binary files a/src/gfx/cardpop3.t3.png and /dev/null differ diff --git a/src/gfx/overworld_map_oam.png b/src/gfx/overworld_map_oam.png new file mode 100644 index 0000000..323fc59 Binary files /dev/null and b/src/gfx/overworld_map_oam.png differ diff --git a/src/gfx/overworld_sprites/0.png b/src/gfx/overworld_sprites/0.png new file mode 100644 index 0000000..0eceeb6 Binary files /dev/null and b/src/gfx/overworld_sprites/0.png differ diff --git a/src/gfx/overworld_sprites/1.png b/src/gfx/overworld_sprites/1.png new file mode 100644 index 0000000..b3fa35f Binary files /dev/null and b/src/gfx/overworld_sprites/1.png differ diff --git a/src/gfx/overworld_sprites/10.png b/src/gfx/overworld_sprites/10.png new file mode 100644 index 0000000..e63ba2b Binary files /dev/null and b/src/gfx/overworld_sprites/10.png differ diff --git a/src/gfx/overworld_sprites/11.png b/src/gfx/overworld_sprites/11.png new file mode 100644 index 0000000..4a231fe Binary files /dev/null and b/src/gfx/overworld_sprites/11.png differ diff --git a/src/gfx/overworld_sprites/12.png b/src/gfx/overworld_sprites/12.png new file mode 100644 index 0000000..b24cd69 Binary files /dev/null and b/src/gfx/overworld_sprites/12.png differ diff --git a/src/gfx/overworld_sprites/13.png b/src/gfx/overworld_sprites/13.png new file mode 100644 index 0000000..d55c62c Binary files /dev/null and b/src/gfx/overworld_sprites/13.png differ diff --git a/src/gfx/overworld_sprites/14.png b/src/gfx/overworld_sprites/14.png new file mode 100644 index 0000000..0026093 Binary files /dev/null and b/src/gfx/overworld_sprites/14.png differ diff --git a/src/gfx/overworld_sprites/15.png b/src/gfx/overworld_sprites/15.png new file mode 100644 index 0000000..67a227d Binary files /dev/null and b/src/gfx/overworld_sprites/15.png differ diff --git a/src/gfx/overworld_sprites/16.png b/src/gfx/overworld_sprites/16.png new file mode 100644 index 0000000..0baa4eb Binary files /dev/null and b/src/gfx/overworld_sprites/16.png differ diff --git a/src/gfx/overworld_sprites/17.png b/src/gfx/overworld_sprites/17.png new file mode 100644 index 0000000..2f696e6 Binary files /dev/null and b/src/gfx/overworld_sprites/17.png differ diff --git a/src/gfx/overworld_sprites/18.png b/src/gfx/overworld_sprites/18.png new file mode 100644 index 0000000..97281b6 Binary files /dev/null and b/src/gfx/overworld_sprites/18.png differ diff --git a/src/gfx/overworld_sprites/19.png b/src/gfx/overworld_sprites/19.png new file mode 100644 index 0000000..437a376 Binary files /dev/null and b/src/gfx/overworld_sprites/19.png differ diff --git a/src/gfx/overworld_sprites/2.png b/src/gfx/overworld_sprites/2.png new file mode 100644 index 0000000..0bda3be Binary files /dev/null and b/src/gfx/overworld_sprites/2.png differ diff --git a/src/gfx/overworld_sprites/20.png b/src/gfx/overworld_sprites/20.png new file mode 100644 index 0000000..3da8ad9 Binary files /dev/null and b/src/gfx/overworld_sprites/20.png differ diff --git a/src/gfx/overworld_sprites/21.png b/src/gfx/overworld_sprites/21.png new file mode 100644 index 0000000..7d07d78 Binary files /dev/null and b/src/gfx/overworld_sprites/21.png differ diff --git a/src/gfx/overworld_sprites/22.png b/src/gfx/overworld_sprites/22.png new file mode 100644 index 0000000..2d47555 Binary files /dev/null and b/src/gfx/overworld_sprites/22.png differ diff --git a/src/gfx/overworld_sprites/23.png b/src/gfx/overworld_sprites/23.png new file mode 100644 index 0000000..8432c39 Binary files /dev/null and b/src/gfx/overworld_sprites/23.png differ diff --git a/src/gfx/overworld_sprites/24.png b/src/gfx/overworld_sprites/24.png new file mode 100644 index 0000000..0d7b908 Binary files /dev/null and b/src/gfx/overworld_sprites/24.png differ diff --git a/src/gfx/overworld_sprites/25.png b/src/gfx/overworld_sprites/25.png new file mode 100644 index 0000000..1e161da Binary files /dev/null and b/src/gfx/overworld_sprites/25.png differ diff --git a/src/gfx/overworld_sprites/26.png b/src/gfx/overworld_sprites/26.png new file mode 100644 index 0000000..6a5f4cd Binary files /dev/null and b/src/gfx/overworld_sprites/26.png differ diff --git a/src/gfx/overworld_sprites/27.png b/src/gfx/overworld_sprites/27.png new file mode 100644 index 0000000..7b738e4 Binary files /dev/null and b/src/gfx/overworld_sprites/27.png differ diff --git a/src/gfx/overworld_sprites/28.png b/src/gfx/overworld_sprites/28.png new file mode 100644 index 0000000..0ba9e64 Binary files /dev/null and b/src/gfx/overworld_sprites/28.png differ diff --git a/src/gfx/overworld_sprites/29.png b/src/gfx/overworld_sprites/29.png new file mode 100644 index 0000000..5926395 Binary files /dev/null and b/src/gfx/overworld_sprites/29.png differ diff --git a/src/gfx/overworld_sprites/3.png b/src/gfx/overworld_sprites/3.png new file mode 100644 index 0000000..2fac558 Binary files /dev/null and b/src/gfx/overworld_sprites/3.png differ diff --git a/src/gfx/overworld_sprites/30.png b/src/gfx/overworld_sprites/30.png new file mode 100644 index 0000000..ef25140 Binary files /dev/null and b/src/gfx/overworld_sprites/30.png differ diff --git a/src/gfx/overworld_sprites/31.png b/src/gfx/overworld_sprites/31.png new file mode 100644 index 0000000..1494e05 Binary files /dev/null and b/src/gfx/overworld_sprites/31.png differ diff --git a/src/gfx/overworld_sprites/32.png b/src/gfx/overworld_sprites/32.png new file mode 100644 index 0000000..7d3fac1 Binary files /dev/null and b/src/gfx/overworld_sprites/32.png differ diff --git a/src/gfx/overworld_sprites/4.png b/src/gfx/overworld_sprites/4.png new file mode 100644 index 0000000..a12569b Binary files /dev/null and b/src/gfx/overworld_sprites/4.png differ diff --git a/src/gfx/overworld_sprites/5.png b/src/gfx/overworld_sprites/5.png new file mode 100644 index 0000000..d46c9bb Binary files /dev/null and b/src/gfx/overworld_sprites/5.png differ diff --git a/src/gfx/overworld_sprites/6.png b/src/gfx/overworld_sprites/6.png new file mode 100644 index 0000000..2423fd1 Binary files /dev/null and b/src/gfx/overworld_sprites/6.png differ diff --git a/src/gfx/overworld_sprites/7.png b/src/gfx/overworld_sprites/7.png new file mode 100644 index 0000000..c7f1d29 Binary files /dev/null and b/src/gfx/overworld_sprites/7.png differ diff --git a/src/gfx/overworld_sprites/8.png b/src/gfx/overworld_sprites/8.png new file mode 100644 index 0000000..2527ae9 Binary files /dev/null and b/src/gfx/overworld_sprites/8.png differ diff --git a/src/gfx/overworld_sprites/9.png b/src/gfx/overworld_sprites/9.png new file mode 100644 index 0000000..69c5451 Binary files /dev/null and b/src/gfx/overworld_sprites/9.png differ diff --git a/src/gfx/overworld_sprites/doctormason.png b/src/gfx/overworld_sprites/doctormason.png new file mode 100644 index 0000000..8b0f384 Binary files /dev/null and b/src/gfx/overworld_sprites/doctormason.png differ diff --git a/src/gfx/overworld_sprites/help_desk_lady.png b/src/gfx/overworld_sprites/help_desk_lady.png new file mode 100644 index 0000000..92bb5ef Binary files /dev/null and b/src/gfx/overworld_sprites/help_desk_lady.png differ diff --git a/src/gfx/overworld_sprites/player.png b/src/gfx/overworld_sprites/player.png new file mode 100644 index 0000000..2f891ef Binary files /dev/null and b/src/gfx/overworld_sprites/player.png differ diff --git a/src/gfx/overworld_sprites/ronald.png b/src/gfx/overworld_sprites/ronald.png new file mode 100644 index 0000000..4cd2be0 Binary files /dev/null and b/src/gfx/overworld_sprites/ronald.png differ diff --git a/src/gfx/ow/doctormason.png b/src/gfx/ow/doctormason.png deleted file mode 100755 index 8b0f384..0000000 Binary files a/src/gfx/ow/doctormason.png and /dev/null differ diff --git a/src/gfx/ow/help_desk_lady.png b/src/gfx/ow/help_desk_lady.png deleted file mode 100755 index 92bb5ef..0000000 Binary files a/src/gfx/ow/help_desk_lady.png and /dev/null differ diff --git a/src/gfx/ow/player.png b/src/gfx/ow/player.png deleted file mode 100755 index 2f891ef..0000000 Binary files a/src/gfx/ow/player.png and /dev/null differ diff --git a/src/gfx/ow/ronald.png b/src/gfx/ow/ronald.png deleted file mode 100755 index 4cd2be0..0000000 Binary files a/src/gfx/ow/ronald.png and /dev/null differ diff --git a/src/gfx/ow/sprite0.png b/src/gfx/ow/sprite0.png deleted file mode 100755 index 0eceeb6..0000000 Binary files a/src/gfx/ow/sprite0.png and /dev/null differ diff --git a/src/gfx/ow/sprite1.png b/src/gfx/ow/sprite1.png deleted file mode 100755 index b3fa35f..0000000 Binary files a/src/gfx/ow/sprite1.png and /dev/null differ diff --git a/src/gfx/ow/sprite10.png b/src/gfx/ow/sprite10.png deleted file mode 100755 index e63ba2b..0000000 Binary files a/src/gfx/ow/sprite10.png and /dev/null differ diff --git a/src/gfx/ow/sprite11.png b/src/gfx/ow/sprite11.png deleted file mode 100755 index 4a231fe..0000000 Binary files a/src/gfx/ow/sprite11.png and /dev/null differ diff --git a/src/gfx/ow/sprite12.png b/src/gfx/ow/sprite12.png deleted file mode 100755 index b24cd69..0000000 Binary files a/src/gfx/ow/sprite12.png and /dev/null differ diff --git a/src/gfx/ow/sprite13.png b/src/gfx/ow/sprite13.png deleted file mode 100755 index d55c62c..0000000 Binary files a/src/gfx/ow/sprite13.png and /dev/null differ diff --git a/src/gfx/ow/sprite14.png b/src/gfx/ow/sprite14.png deleted file mode 100755 index 0026093..0000000 Binary files a/src/gfx/ow/sprite14.png and /dev/null differ diff --git a/src/gfx/ow/sprite15.png b/src/gfx/ow/sprite15.png deleted file mode 100755 index 67a227d..0000000 Binary files a/src/gfx/ow/sprite15.png and /dev/null differ diff --git a/src/gfx/ow/sprite16.png b/src/gfx/ow/sprite16.png deleted file mode 100755 index 0baa4eb..0000000 Binary files a/src/gfx/ow/sprite16.png and /dev/null differ diff --git a/src/gfx/ow/sprite17.png b/src/gfx/ow/sprite17.png deleted file mode 100755 index 2f696e6..0000000 Binary files a/src/gfx/ow/sprite17.png and /dev/null differ diff --git a/src/gfx/ow/sprite18.png b/src/gfx/ow/sprite18.png deleted file mode 100755 index 97281b6..0000000 Binary files a/src/gfx/ow/sprite18.png and /dev/null differ diff --git a/src/gfx/ow/sprite19.png b/src/gfx/ow/sprite19.png deleted file mode 100755 index 437a376..0000000 Binary files a/src/gfx/ow/sprite19.png and /dev/null differ diff --git a/src/gfx/ow/sprite2.png b/src/gfx/ow/sprite2.png deleted file mode 100755 index 0bda3be..0000000 Binary files a/src/gfx/ow/sprite2.png and /dev/null differ diff --git a/src/gfx/ow/sprite20.png b/src/gfx/ow/sprite20.png deleted file mode 100755 index 3da8ad9..0000000 Binary files a/src/gfx/ow/sprite20.png and /dev/null differ diff --git a/src/gfx/ow/sprite21.png b/src/gfx/ow/sprite21.png deleted file mode 100755 index 7d07d78..0000000 Binary files a/src/gfx/ow/sprite21.png and /dev/null differ diff --git a/src/gfx/ow/sprite22.png b/src/gfx/ow/sprite22.png deleted file mode 100755 index 2d47555..0000000 Binary files a/src/gfx/ow/sprite22.png and /dev/null differ diff --git a/src/gfx/ow/sprite23.png b/src/gfx/ow/sprite23.png deleted file mode 100755 index 8432c39..0000000 Binary files a/src/gfx/ow/sprite23.png and /dev/null differ diff --git a/src/gfx/ow/sprite24.png b/src/gfx/ow/sprite24.png deleted file mode 100755 index 0d7b908..0000000 Binary files a/src/gfx/ow/sprite24.png and /dev/null differ diff --git a/src/gfx/ow/sprite25.png b/src/gfx/ow/sprite25.png deleted file mode 100755 index 1e161da..0000000 Binary files a/src/gfx/ow/sprite25.png and /dev/null differ diff --git a/src/gfx/ow/sprite26.png b/src/gfx/ow/sprite26.png deleted file mode 100755 index 6a5f4cd..0000000 Binary files a/src/gfx/ow/sprite26.png and /dev/null differ diff --git a/src/gfx/ow/sprite27.png b/src/gfx/ow/sprite27.png deleted file mode 100755 index 7b738e4..0000000 Binary files a/src/gfx/ow/sprite27.png and /dev/null differ diff --git a/src/gfx/ow/sprite28.png b/src/gfx/ow/sprite28.png deleted file mode 100755 index 0ba9e64..0000000 Binary files a/src/gfx/ow/sprite28.png and /dev/null differ diff --git a/src/gfx/ow/sprite29.png b/src/gfx/ow/sprite29.png deleted file mode 100755 index 5926395..0000000 Binary files a/src/gfx/ow/sprite29.png and /dev/null differ diff --git a/src/gfx/ow/sprite3.png b/src/gfx/ow/sprite3.png deleted file mode 100755 index 2fac558..0000000 Binary files a/src/gfx/ow/sprite3.png and /dev/null differ diff --git a/src/gfx/ow/sprite30.png b/src/gfx/ow/sprite30.png deleted file mode 100755 index ef25140..0000000 Binary files a/src/gfx/ow/sprite30.png and /dev/null differ diff --git a/src/gfx/ow/sprite31.png b/src/gfx/ow/sprite31.png deleted file mode 100755 index 1494e05..0000000 Binary files a/src/gfx/ow/sprite31.png and /dev/null differ diff --git a/src/gfx/ow/sprite32.png b/src/gfx/ow/sprite32.png deleted file mode 100755 index 7d3fac1..0000000 Binary files a/src/gfx/ow/sprite32.png and /dev/null differ diff --git a/src/gfx/ow/sprite4.png b/src/gfx/ow/sprite4.png deleted file mode 100755 index a12569b..0000000 Binary files a/src/gfx/ow/sprite4.png and /dev/null differ diff --git a/src/gfx/ow/sprite5.png b/src/gfx/ow/sprite5.png deleted file mode 100755 index d46c9bb..0000000 Binary files a/src/gfx/ow/sprite5.png and /dev/null differ diff --git a/src/gfx/ow/sprite6.png b/src/gfx/ow/sprite6.png deleted file mode 100755 index 2423fd1..0000000 Binary files a/src/gfx/ow/sprite6.png and /dev/null differ diff --git a/src/gfx/ow/sprite7.png b/src/gfx/ow/sprite7.png deleted file mode 100755 index c7f1d29..0000000 Binary files a/src/gfx/ow/sprite7.png and /dev/null differ diff --git a/src/gfx/ow/sprite8.png b/src/gfx/ow/sprite8.png deleted file mode 100755 index 2527ae9..0000000 Binary files a/src/gfx/ow/sprite8.png and /dev/null differ diff --git a/src/gfx/ow/sprite9.png b/src/gfx/ow/sprite9.png deleted file mode 100755 index 69c5451..0000000 Binary files a/src/gfx/ow/sprite9.png and /dev/null differ diff --git a/src/gfx/ow_map_oam.png b/src/gfx/ow_map_oam.png deleted file mode 100755 index 323fc59..0000000 Binary files a/src/gfx/ow_map_oam.png and /dev/null differ diff --git a/src/gfx/titlescreen/booster_packs/aerodactylintro1.png b/src/gfx/titlescreen/booster_packs/aerodactylintro1.png new file mode 100644 index 0000000..e18b96b Binary files /dev/null and b/src/gfx/titlescreen/booster_packs/aerodactylintro1.png differ diff --git a/src/gfx/titlescreen/booster_packs/aerodactylintro2.png b/src/gfx/titlescreen/booster_packs/aerodactylintro2.png new file mode 100644 index 0000000..ba347b5 Binary files /dev/null and b/src/gfx/titlescreen/booster_packs/aerodactylintro2.png differ diff --git a/src/gfx/titlescreen/booster_packs/charizardintro1.png b/src/gfx/titlescreen/booster_packs/charizardintro1.png new file mode 100644 index 0000000..50e757f Binary files /dev/null and b/src/gfx/titlescreen/booster_packs/charizardintro1.png differ diff --git a/src/gfx/titlescreen/booster_packs/charizardintro2.png b/src/gfx/titlescreen/booster_packs/charizardintro2.png new file mode 100644 index 0000000..c7ec7b4 Binary files /dev/null and b/src/gfx/titlescreen/booster_packs/charizardintro2.png differ diff --git a/src/gfx/titlescreen/booster_packs/scytherintro1.png b/src/gfx/titlescreen/booster_packs/scytherintro1.png new file mode 100644 index 0000000..3e6bd36 Binary files /dev/null and b/src/gfx/titlescreen/booster_packs/scytherintro1.png differ diff --git a/src/gfx/titlescreen/booster_packs/scytherintro2.png b/src/gfx/titlescreen/booster_packs/scytherintro2.png new file mode 100644 index 0000000..c6fd814 Binary files /dev/null and b/src/gfx/titlescreen/booster_packs/scytherintro2.png differ diff --git a/src/gfx/titlescreen/colorless.png b/src/gfx/titlescreen/colorless.png deleted file mode 100755 index fe55d79..0000000 Binary files a/src/gfx/titlescreen/colorless.png and /dev/null differ diff --git a/src/gfx/titlescreen/energies/colorless.png b/src/gfx/titlescreen/energies/colorless.png new file mode 100644 index 0000000..fe55d79 Binary files /dev/null and b/src/gfx/titlescreen/energies/colorless.png differ diff --git a/src/gfx/titlescreen/energies/fighting.png b/src/gfx/titlescreen/energies/fighting.png new file mode 100644 index 0000000..849d5d6 Binary files /dev/null and b/src/gfx/titlescreen/energies/fighting.png differ diff --git a/src/gfx/titlescreen/energies/fire.png b/src/gfx/titlescreen/energies/fire.png new file mode 100644 index 0000000..518fcfc Binary files /dev/null and b/src/gfx/titlescreen/energies/fire.png differ diff --git a/src/gfx/titlescreen/energies/grass.png b/src/gfx/titlescreen/energies/grass.png new file mode 100644 index 0000000..b864fc4 Binary files /dev/null and b/src/gfx/titlescreen/energies/grass.png differ diff --git a/src/gfx/titlescreen/energies/lightning.png b/src/gfx/titlescreen/energies/lightning.png new file mode 100644 index 0000000..9dcddef Binary files /dev/null and b/src/gfx/titlescreen/energies/lightning.png differ diff --git a/src/gfx/titlescreen/energies/psychic.png b/src/gfx/titlescreen/energies/psychic.png new file mode 100644 index 0000000..60bbe0b Binary files /dev/null and b/src/gfx/titlescreen/energies/psychic.png differ diff --git a/src/gfx/titlescreen/energies/water.png b/src/gfx/titlescreen/energies/water.png new file mode 100644 index 0000000..124f54c Binary files /dev/null and b/src/gfx/titlescreen/energies/water.png differ diff --git a/src/gfx/titlescreen/fighting.png b/src/gfx/titlescreen/fighting.png deleted file mode 100755 index 849d5d6..0000000 Binary files a/src/gfx/titlescreen/fighting.png and /dev/null differ diff --git a/src/gfx/titlescreen/fire.png b/src/gfx/titlescreen/fire.png deleted file mode 100755 index 518fcfc..0000000 Binary files a/src/gfx/titlescreen/fire.png and /dev/null differ diff --git a/src/gfx/titlescreen/grass.png b/src/gfx/titlescreen/grass.png deleted file mode 100755 index b864fc4..0000000 Binary files a/src/gfx/titlescreen/grass.png and /dev/null differ diff --git a/src/gfx/titlescreen/lightning.png b/src/gfx/titlescreen/lightning.png deleted file mode 100755 index 9dcddef..0000000 Binary files a/src/gfx/titlescreen/lightning.png and /dev/null differ diff --git a/src/gfx/titlescreen/psychic.png b/src/gfx/titlescreen/psychic.png deleted file mode 100755 index 60bbe0b..0000000 Binary files a/src/gfx/titlescreen/psychic.png and /dev/null differ diff --git a/src/gfx/titlescreen/water.png b/src/gfx/titlescreen/water.png deleted file mode 100755 index 124f54c..0000000 Binary files a/src/gfx/titlescreen/water.png and /dev/null differ diff --git a/src/text/text1.asm b/src/text/text1.asm index eb11f83..3c82b18 100755 --- a/src/text/text1.asm +++ b/src/text/text1.asm @@ -992,7 +992,7 @@ Text00d5: ; 37a3a (d:7a3a) text "A Transmission Error occured." done -Text00d6: ; 37a59 (d:7a59) +BackUpIsBrokenText: ; 37a59 (d:7a59) text "Back Up is broken." done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index 7b60d4f..acb7f4c 100755 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -215,7 +215,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text00d3 textpointer UnableDueToToxicGasText textpointer Text00d5 - textpointer Text00d6 + textpointer BackUpIsBrokenText textpointer Text00d7 textpointer Text00d8 textpointer Text00d9 -- cgit v1.2.3