From d9f52a57a604cc1204f6077e21d75e04cb954672 Mon Sep 17 00:00:00 2001 From: Zumi <13794376+ZoomTen@users.noreply.github.com> Date: Tue, 26 Jan 2021 10:29:07 +0700 Subject: Disassemble RTC setup dialog and slot machine minigame (bank $24) (#87) Also identify SFX and cry pointers --- gfx/font/up_arrow.1bpp.png | Bin 0 -> 86 bytes gfx/gfx.asm | 5 ++++- gfx/gfx.mk | 5 ++++- gfx/minigames/slots.png | Bin 469 -> 0 bytes gfx/minigames/slots_1.png | Bin 0 -> 469 bytes gfx/minigames/slots_2.png | Bin 1278 -> 419 bytes gfx/minigames/slots_3.png | Bin 0 -> 554 bytes gfx/minigames/slots_4.png | Bin 0 -> 411 bytes gfx/minigames/slots_tilemap.bin | Bin 0 -> 240 bytes 9 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 gfx/font/up_arrow.1bpp.png delete mode 100644 gfx/minigames/slots.png create mode 100644 gfx/minigames/slots_1.png create mode 100644 gfx/minigames/slots_3.png create mode 100644 gfx/minigames/slots_4.png create mode 100644 gfx/minigames/slots_tilemap.bin (limited to 'gfx') diff --git a/gfx/font/up_arrow.1bpp.png b/gfx/font/up_arrow.1bpp.png new file mode 100644 index 0000000..32a3c91 Binary files /dev/null and b/gfx/font/up_arrow.1bpp.png differ diff --git a/gfx/gfx.asm b/gfx/gfx.asm index 8c3fb8a..b4ed26d 100644 --- a/gfx/gfx.asm +++ b/gfx/gfx.asm @@ -407,9 +407,12 @@ SnorlaxIcon:: INCBIN "gfx/icons/snorlax.2bpp" SECTION "gfx.asm@Slot Machine GFX", ROMX SlotMachineGFX:: -INCBIN "gfx/minigames/slots.2bpp" +INCBIN "gfx/minigames/slots_1.2bpp" SlotMachine2GFX:: INCBIN "gfx/minigames/slots_2.2bpp" +INCBIN "gfx/minigames/slots_3.2bpp" +SlotMachine3GFX:: +INCBIN "gfx/minigames/slots_4.2bpp" SECTION "gfx.asm@Bank 30 Sprites 1", ROMX GoldSpriteGFX:: INCBIN "gfx/sprites/gold.2bpp" diff --git a/gfx/gfx.mk b/gfx/gfx.mk index 0de08dc..6880d1a 100644 --- a/gfx/gfx.mk +++ b/gfx/gfx.mk @@ -12,7 +12,10 @@ $(BUILD)/gfx/trainer_card/leaders.2bpp: tools/gfx += --trim-whitespace $(BUILD)/gfx/trainer_gear/town_map.2bpp: tools/gfx += --trim-trailing -$(BUILD)/gfx/minigames/slots.2bpp: tools/gfx += --trim-whitespace +$(BUILD)/gfx/minigames/slots_1.2bpp: tools/gfx += --trim-whitespace +$(BUILD)/gfx/minigames/slots_2.2bpp: tools/gfx += --interleave --png=$< +$(BUILD)/gfx/minigames/slots_3.2bpp: tools/gfx += --interleave --png=$< --remove-duplicates --keep-whitespace --remove-xflip +$(BUILD)/gfx/minigames/slots_4.2bpp: tools/gfx += --interleave --png=$< $(BUILD)/gfx/minigames/poker.2bpp: tools/gfx += --trim-whitespace $(BUILD)/gfx/intro/jigglypuff_pikachu.2bpp: tools/gfx += --trim-whitespace diff --git a/gfx/minigames/slots.png b/gfx/minigames/slots.png deleted file mode 100644 index 44993f6..0000000 Binary files a/gfx/minigames/slots.png and /dev/null differ diff --git a/gfx/minigames/slots_1.png b/gfx/minigames/slots_1.png new file mode 100644 index 0000000..44993f6 Binary files /dev/null and b/gfx/minigames/slots_1.png differ diff --git a/gfx/minigames/slots_2.png b/gfx/minigames/slots_2.png index cae4177..97d7fb7 100644 Binary files a/gfx/minigames/slots_2.png and b/gfx/minigames/slots_2.png differ diff --git a/gfx/minigames/slots_3.png b/gfx/minigames/slots_3.png new file mode 100644 index 0000000..9ce0a0d Binary files /dev/null and b/gfx/minigames/slots_3.png differ diff --git a/gfx/minigames/slots_4.png b/gfx/minigames/slots_4.png new file mode 100644 index 0000000..aa0c685 Binary files /dev/null and b/gfx/minigames/slots_4.png differ diff --git a/gfx/minigames/slots_tilemap.bin b/gfx/minigames/slots_tilemap.bin new file mode 100644 index 0000000..68807bb Binary files /dev/null and b/gfx/minigames/slots_tilemap.bin differ -- cgit v1.2.3