ref: 214b2cb0d9c8848ec67494f2800acb0bf8217030
parent: d2948015606df62ef8b1bbb8231f6ebe67ffc5ce
parent: 288ba5a50fc5db1df1c9ec65aae40c8a23f3f50b
author: U-Fish-PC\Daniel <corrnondacqb@yahoo.com>
date: Tue Sep 3 10:23:50 EDT 2013
Merge branch 'incbin' of https://github.com/dannye/pokered
--- a/main.asm
+++ b/main.asm
@@ -98998,11 +98998,11 @@
ld hl, $8a20
ld bc, (BANK(FallingStar) << 8) + $01
call CopyVideoData
- ld hl, Unknown_70140 ; $4140
+ ld hl, GameFreakLogoOAMData ; $4140
ld de, $c360
ld bc, $40
call CopyData
- ld hl, Unknown_70180 ; $4180
+ ld hl, GameFreakShootingStarOAMData ; $4180
ld de, W_OAMBUFFER
ld bc, $10
jp CopyData
@@ -99144,11 +99144,14 @@
jr nz, .asm_70121
ret
-Unknown_70140: ; 70140 (1c:4140)
-INCBIN "baserom.gbc",$70140,$70180 - $70140
+GameFreakLogoOAMData: ; 70140 (1c:4140)
+ db $48,$50,$8D,$00,$48,$58,$8E,$00,$50,$50,$8F,$00,$50,$58,$90,$00
+ db $58,$50,$91,$00,$58,$58,$92,$00,$60,$30,$80,$00,$60,$38,$81,$00
+ db $60,$40,$82,$00,$60,$48,$83,$00,$60,$50,$93,$00,$60,$58,$84,$00
+ db $60,$60,$85,$00,$60,$68,$83,$00,$60,$70,$81,$00,$60,$78,$86,$00
-Unknown_70180: ; 70180 (1c:4180)
-INCBIN "baserom.gbc",$70180,$70190 - $70180
+GameFreakShootingStarOAMData: ; 70180 (1c:4180)
+ db $00,$A0,$A0,$10,$00,$A8,$A0,$30,$08,$A0,$A1,$10,$08,$A8,$A1,$30
FallingStar: ; 70190 (1c:4190)
INCBIN "gfx/falling_star.2bpp"