diff options
| author | Háčky <hatschky@gmail.com> | 2014-11-27 07:15:45 +0000 |
|---|---|---|
| committer | Háčky <hatschky@gmail.com> | 2014-11-27 07:15:45 +0000 |
| commit | 319ed6d0e0266f5f6174a5acd929914db8cfae1d (patch) | |
| tree | 76408d9cadcbed1e702efa8c44f4cf5e364b0a4d /battle-e/enigmaberry.asm | |
| parent | 17853b802692237d98f96d1a80caf2019f71753e (diff) | |
Diffstat (limited to 'battle-e/enigmaberry.asm')
| -rw-r--r-- | battle-e/enigmaberry.asm | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/battle-e/enigmaberry.asm b/battle-e/enigmaberry.asm index a6f0dce..36537ff 100644 --- a/battle-e/enigmaberry.asm +++ b/battle-e/enigmaberry.asm @@ -1,7 +1,3 @@ -INCLUDE "../macros.asm" -INCLUDE "macros.asm" - -EnigmaBerry: MACRO SECTION "drashberry",ROM0[$100] jp Start db $00 @@ -25,16 +21,10 @@ REPT 72 ENDR Prologue: - Insert_Prologue $12345678, "カ。ドＥ@", REGION_EN ; corrupted カードｅ “Card e” + INCBIN "prologue-{REGION_NAME}.bin" DataPacket: - Insert_Header REGION_EN - db CUSTOM_BERRY - GBAPTR DataPacket, BerryData - dw $0002 - -BerryData: - INCBIN \1 + INCBIN "berries/{BERRY}-{REGION_NAME}.mev" db 0,0 INCLUDE "../common/mem_struct.asm" @@ -43,7 +33,7 @@ BackgroundSpriteData: dw BackgroundSprite, BackgroundPalette, BackgroundTilemap db $05,$00,$01,$00 BerrySpriteData: - dw (BerryData+$1C),(BerryData+$49C) + dw (DataPacket+$18+$1C),(DataPacket+$18+$49C) db $06,$06,$01,$01,$01,$01,$01 Instructions1: ; B65 @@ -133,8 +123,7 @@ INCLUDE "../common/wrap_up.asm" INCLUDE "../common/word_shift_right.asm" -SomeVar1: ds 1 ; EFA -SomeVar2: ds 2 ; EFB -RegionHandlePtr: ds 1 ; EFD -SpriteHandlePtr: ds 2 ; EFE -ENDM
\ No newline at end of file +SomeVar1: EOF ; EFA +SomeVar2: dw 0 ; EFB +RegionHandlePtr: db 0 ; EFD +SpriteHandlePtr: dw 0 ; EFE
\ No newline at end of file |