diff options
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | engine/games/slot_machine.asm | 20 | ||||
| -rw-r--r-- | engine/phone/phone.asm | 12 | ||||
| -rw-r--r-- | engine/pokegear/pokegear.asm | 10 | ||||
| -rw-r--r-- | engine/rtc/timeset.asm | 2 | ||||
| -rw-r--r-- | gfx/new_game/down_arrow.png | bin | 0 -> 82 bytes | |||
| -rw-r--r-- | gfx/new_game/timeset_bg.png | bin | 0 -> 68 bytes | |||
| -rw-r--r-- | gfx/new_game/up_arrow.png | bin | 0 -> 82 bytes | |||
| -rw-r--r-- | gfx/pokegear/dexmap_nest_icon.png | bin | 0 -> 86 bytes | |||
| -rw-r--r-- | gfx/pokegear/fast_ship.png | bin | 0 -> 154 bytes | |||
| -rw-r--r-- | gfx/pokegear/flymap_label_border.png | bin | 0 -> 121 bytes | |||
| -rw-r--r-- | gfx/pokegear/pokegear_sprites.png | bin | 0 -> 133 bytes | |||
| -rw-r--r-- | gfx/slots/slots_1.png | bin | 0 -> 433 bytes | |||
| -rw-r--r-- | gfx/slots/slots_2.png | bin | 0 -> 664 bytes | |||
| -rw-r--r-- | gfx/slots/slots_3.png | bin | 0 -> 1895 bytes | |||
| -rw-r--r-- | tools/gfx.py | 16 |
16 files changed, 44 insertions, 25 deletions
@@ -58,7 +58,7 @@ tidy: clean: rm -f $(roms) $(gold_obj) $(silver_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) rgbdscheck.o - find gfx \( -iname "*.png" -not -iname "big_onix.png" \) -delete + find gfx \( -iname "*.png" -not -iname "big_onix.png" -not -iname "slots_3.png" \) -delete $(MAKE) clean -C tools/ compare: $(roms) @@ -120,4 +120,9 @@ pngs: find gfx -iname "*.[12]bpp" -exec touch {} + find gfx -iname "*.lz" -exec touch {} + find gfx/pokemon gfx/trainers -iname "*.[1,2]bpp" -delete - rm gfx/battle/dude.2bpp gfx/player/chris_back.2bpp gfx/trade/game_boy.2bpp + rm \ + gfx/battle/dude.2bpp \ + gfx/player/chris_back.2bpp \ + gfx/trade/game_boy.2bpp \ + gfx/pokegear/pokegear_sprites.2bpp \ + gfx/slots/slots_*.2bpp diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm index d7062842..7c017a6a 100644 --- a/engine/games/slot_machine.asm +++ b/engine/games/slot_machine.asm @@ -184,7 +184,7 @@ SlotsLoop: ld [wCurSpriteOAMAddr], a callfar DoNextFrameForFirst16Sprites call .PrintCoinsAndPayout - call .Stubbed_Function927d3 + call .Stubbed_Function92d3c call DelayFrame and a ret @@ -193,7 +193,7 @@ SlotsLoop: scf ret -.Stubbed_Function927d3: +.Stubbed_Function92d3c: ; dummied out ret ld a, [wReel1ReelAction] @@ -229,7 +229,7 @@ SlotsLoop: call PrintNum ret -Unreferenced_Function92811: +Unreferenced_Function92d7a: ; debug function? ld a, [wSlotBias] add 0 @@ -247,7 +247,7 @@ Unreferenced_Function92811: ld [hl], a ret -Unreferenced_Function9282c: +Unreferenced_Function92d95: ; animate OAM tiles? ld hl, wSlotsCE66 ld a, [hl] @@ -844,20 +844,20 @@ Slots_UpdateReelPositionAndOAM: jr nz, .loop ret -Unreferenced_Function92bbe: +Unreferenced_Function93127: push hl srl a srl a - add LOW(.Unknown_92bce) + add LOW(.Unknown_93137) ld l, a ld a, 0 - adc HIGH(.Unknown_92bce) + adc HIGH(.Unknown_93137) ld h, a ld a, [hl] pop hl ret -.Unknown_92bce: +.Unknown_93137: db 0, 1, 2, 3, 4, 5 ReelActionJumptable: @@ -1089,11 +1089,11 @@ ReelAction_WaitReel2SkipTo7: add hl, bc ld a, [hl] and a - jr z, .asm_92d02 + jr z, .asm_9326b dec [hl] ret -.asm_92d02 +.asm_9326b ld a, SFX_THROW_BALL call Slots_PlaySFX ld hl, REEL_ACTION diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index 8ae66def..7ee9d0f0 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -318,7 +318,7 @@ SpecialCallWhereverYouAre: scf ret -Function90199: +Function901a1: ; Don't do the call if you're in a link communication ld a, [wLinkMode] and a @@ -469,7 +469,7 @@ RingTwice_StartCall: Phone_CallerTextboxWithName: ld a, [wCurCaller] ld b, a - call Function90363 + call Function90357 ret PhoneCall:: @@ -529,7 +529,7 @@ Phone_CallEnd: call HangUp_Wait20Frames ret -Function90316: +Function9030a: ld de, SFX_SHUT_DOWN_PC call PlaySFX ret @@ -576,7 +576,7 @@ Phone_Wait20Frames: farcall PhoneRing_CopyTilemapAtOnce ret -Function90363: +Function90357: push bc call Phone_CallerTextbox hlcoord 1, 1 @@ -586,7 +586,7 @@ Function90363: ld d, h ld e, l pop bc - call Function90380 + call Function90374 ret Phone_CallerTextbox: @@ -596,7 +596,7 @@ Phone_CallerTextbox: call Textbox ret -Function90380: +Function90374: ld h, d ld l, e ld a, b diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index 00eb4e92..5443889a 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -900,7 +900,7 @@ PokegearPhone_MakePhoneCall: call WaitSFX ld a, [wPokegearPhoneSelectedPerson] ld b, a - call Function90199 + call Function901a1 ld c, 10 call DelayFrames ld hl, wOptions @@ -1045,7 +1045,7 @@ PokegearPhone_UpdateDisplayList: ld e, l pop af ld b, a - call Function90380 + call Function90374 pop hl ld a, [wPokegearPhoneLoadNameBuffer] inc a @@ -2001,7 +2001,7 @@ _FlyMap: lb bc, BANK(FlyMapLabelBorderGFX), 6 call Request1bpp call FlyMap - call ret_91c8f + call ret_91bfd ld b, SCGB_POKEGEAR_PALS call GetSGBLayout call SetPalettes @@ -2206,7 +2206,7 @@ HasVisitedSpawn: INCLUDE "data/maps/flypoints.asm" -ret_91c8f: +ret_91bfd: ret FlyMap: @@ -2748,7 +2748,7 @@ INCBIN "gfx/pokegear/dexmap_nest_icon.2bpp" FlyMapLabelBorderGFX: INCBIN "gfx/pokegear/flymap_label_border.1bpp" -Unreferenced_Function92311: +Unreferenced_Function92264: xor a ld [wTownMapPlayerIconLandmark], a call ClearBGPalettes diff --git a/engine/rtc/timeset.asm b/engine/rtc/timeset.asm index 210c89a2..b89d1af7 100644 --- a/engine/rtc/timeset.asm +++ b/engine/rtc/timeset.asm @@ -193,7 +193,7 @@ DisplayHourOClock: pop hl ret -UnreferencedFunction907f1: +UnreferencedFunction907ba: ld h, d ld l, e push hl diff --git a/gfx/new_game/down_arrow.png b/gfx/new_game/down_arrow.png Binary files differnew file mode 100644 index 00000000..33803e19 --- /dev/null +++ b/gfx/new_game/down_arrow.png diff --git a/gfx/new_game/timeset_bg.png b/gfx/new_game/timeset_bg.png Binary files differnew file mode 100644 index 00000000..e2bd6299 --- /dev/null +++ b/gfx/new_game/timeset_bg.png diff --git a/gfx/new_game/up_arrow.png b/gfx/new_game/up_arrow.png Binary files differnew file mode 100644 index 00000000..d8cfc7f3 --- /dev/null +++ b/gfx/new_game/up_arrow.png diff --git a/gfx/pokegear/dexmap_nest_icon.png b/gfx/pokegear/dexmap_nest_icon.png Binary files differnew file mode 100644 index 00000000..f8ffdc82 --- /dev/null +++ b/gfx/pokegear/dexmap_nest_icon.png diff --git a/gfx/pokegear/fast_ship.png b/gfx/pokegear/fast_ship.png Binary files differnew file mode 100644 index 00000000..e92f00f5 --- /dev/null +++ b/gfx/pokegear/fast_ship.png diff --git a/gfx/pokegear/flymap_label_border.png b/gfx/pokegear/flymap_label_border.png Binary files differnew file mode 100644 index 00000000..69818d0e --- /dev/null +++ b/gfx/pokegear/flymap_label_border.png diff --git a/gfx/pokegear/pokegear_sprites.png b/gfx/pokegear/pokegear_sprites.png Binary files differnew file mode 100644 index 00000000..746d4b48 --- /dev/null +++ b/gfx/pokegear/pokegear_sprites.png diff --git a/gfx/slots/slots_1.png b/gfx/slots/slots_1.png Binary files differnew file mode 100644 index 00000000..10431e71 --- /dev/null +++ b/gfx/slots/slots_1.png diff --git a/gfx/slots/slots_2.png b/gfx/slots/slots_2.png Binary files differnew file mode 100644 index 00000000..aa1292cc --- /dev/null +++ b/gfx/slots/slots_2.png diff --git a/gfx/slots/slots_3.png b/gfx/slots/slots_3.png Binary files differnew file mode 100644 index 00000000..e166e3fc --- /dev/null +++ b/gfx/slots/slots_3.png diff --git a/tools/gfx.py b/tools/gfx.py index 2a3c8891..b84aa57d 100644 --- a/tools/gfx.py +++ b/tools/gfx.py @@ -160,10 +160,24 @@ def filepath_rules(filepath): if name == 'chris_back': args['pic_dimensions'] = 6, 6 + elif 'gfx/pokegear' in filedir: + if name == 'pokegear_sprites': + args['width'] = 16 + elif 'gfx/sgb' in filedir: args['width'] = 128 args['pal_file'] = os.path.join(filedir, name + '.pal') + elif 'gfx/slots' in filedir: + if name == 'slots_1': + args['width'] = 16 + elif name == 'slots_2': + args['width'] = 16 + args['pic_dimensions'] = 2, 2 + # TODO: this is incomplete + elif name == 'slots_3': + args['width'] = 24 + elif 'gfx/sprites' in filedir: # TODO: this is incomplete if name == 'big_onix': @@ -259,7 +273,7 @@ def to_png(filename, **kwargs): basedir, basename = os.path.split(filename) name, ext = os.path.splitext(basename) # TODO: how to actually make big_onix.png (reusing one from pokecrystal for now) - if name == 'big_onix': + if name in ['big_onix', 'slots_3']: return if name in ['back_gold', 'back_silver']: kwargs['fileout'] = os.path.join(basedir, 'back.png') |
