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/battletrainer.asm | |
| parent | 17853b802692237d98f96d1a80caf2019f71753e (diff) | |
Diffstat (limited to 'battle-e/battletrainer.asm')
| -rw-r--r-- | battle-e/battletrainer.asm | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/battle-e/battletrainer.asm b/battle-e/battletrainer.asm index 4516fb5..421ddd3 100644 --- a/battle-e/battletrainer.asm +++ b/battle-e/battletrainer.asm @@ -1,6 +1,3 @@ -INCLUDE "../macros.asm" - -BattleTrainer: MACRO SECTION "battletrainer",ROM0[$100] jp Start db $00 @@ -24,21 +21,16 @@ BackdropTilemap: ; A7C INCBIN "sprites/battletrainer.tilemap" Prologue: ; 0DFC - Insert_Prologue $12345678, "カ。ドＥ@", REGION_EN ; corrupted カードｅ “Card e” + INCBIN "prologue-{REGION_NAME}.bin" DataPacket: ; 0E38 - Insert_Header REGION_EN - db BATTLE_TRAINER - GBAPTR DataPacket, TrainerData ; $02000018 - dw $0002 -TrainerData: ; 0E50 - INCBIN \1 + INCBIN "trainers/{TRAINER}-{REGION_NAME}.mev" REPT 44 db 0 ; pads the data to 256 bytes ENDR TrainerSprite: ; 0F38 - INCBIN \2 + INCBIN "sprites/trainers/{CLASS}.4bpp" TrainerSpriteData: ; 1738 dw TrainerSprite dw TrainerPalette @@ -196,10 +188,9 @@ INCLUDE "../common/transfer_data.asm" INCLUDE "../common/wrap_up.asm" INCLUDE "../common/word_shift_right.asm" -SomeVar1: ds 1 ; 1B9F -SomeVar2: ds 2 ; 1BA0 -RegionHandlePtr: ds 1 ; 1BA2 -LeftDoorSpriteHandle: ds 2 ; 1BA3 -RightDoorSpriteHandle: ds 2 ; 1BA5 -TrainerSpriteHandle: ds 2 ; 1BA7 -ENDM
\ No newline at end of file +SomeVar1: EOF ; 1B9F +SomeVar2: dw 0 ; 1BA0 +RegionHandlePtr: db 0 ; 1BA2 +LeftDoorSpriteHandle: dw 0 ; 1BA3 +RightDoorSpriteHandle: dw 0 ; 1BA5 +TrainerSpriteHandle: dw 0 ; 1BA7
\ No newline at end of file |