Sync with pokered

2 files changed, 221 insertions, 0 deletions

diff --git a/data/sprites/facings.asm b/data/sprites/facings.asm
new file mode 100644
index 00000000..e87a9627
--- /dev/null
+++ b/data/sprites/facings.asm
@@ -0,0 +1,131 @@
+SpriteFacingAndAnimationTable:
+	dw .StandingDown  ; facing down, walk animation frame 0
+	dw .WalkingDown   ; facing down, walk animation frame 1
+	dw .StandingDown  ; facing down, walk animation frame 2
+	dw .WalkingDown2  ; facing down, walk animation frame 3
+	dw .StandingUp    ; facing up, walk animation frame 0
+	dw .WalkingUp     ; facing up, walk animation frame 1
+	dw .StandingUp    ; facing up, walk animation frame 2
+	dw .WalkingUp2    ; facing up, walk animation frame 3
+	dw .StandingLeft  ; facing left, walk animation frame 0
+	dw .WalkingLeft   ; facing left, walk animation frame 1
+	dw .StandingLeft  ; facing left, walk animation frame 2
+	dw .WalkingLeft   ; facing left, walk animation frame 3
+	dw .StandingRight ; facing right, walk animation frame 0
+	dw .WalkingRight  ; facing right, walk animation frame 1
+	dw .StandingRight ; facing right, walk animation frame 2
+	dw .WalkingRight  ; facing right, walk animation frame 3
+; The rest of this table is used for sprites $a and $b.
+; All orientation and animation parameters lead to the same result.
+; Used for immobile sprites like items on the ground.
+	dw .StandingDown
+	dw .StandingDown
+	dw .StandingDown
+	dw .StandingDown
+	dw .StandingDown
+	dw .StandingDown
+	dw .StandingDown
+	dw .StandingDown
+	dw .StandingDown
+	dw .StandingDown
+	dw .StandingDown
+	dw .StandingDown
+	dw .StandingDown
+	dw .StandingDown
+	dw .StandingDown
+	dw .StandingDown
+; special case
+	dw SpriteSpecialCase ; pikachu maybe?
+
+.StandingDown:
+	db $04
+; Sprite OAM Parameters
+	db $00, $00, $00, $00                                      ; top left
+	db $00, $08, $01, $00                                      ; top right
+	db $08, $00, $02, OAMFLAG_CANBEMASKED                      ; bottom left
+	db $08, $08, $03, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA  ; bottom right
+
+.WalkingDown:
+	db $04
+; Sprite OAM Parameters
+	db $00, $00, $80, $00                                      ; top left
+	db $00, $08, $81, $00                                      ; top right
+	db $08, $00, $82, OAMFLAG_CANBEMASKED                      ; bottom left
+	db $08, $08, $83, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA  ; bottom right
+
+.WalkingDown2:
+	db $04
+; Sprite OAM Parameters
+	db $00, $08, $80, OAM_HFLIP                                           ; top left
+	db $00, $00, $81, OAM_HFLIP                                           ; top right
+	db $08, $08, $82, OAM_HFLIP | OAMFLAG_CANBEMASKED                     ; bottom left
+	db $08, $00, $83, OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right
+
+.StandingUp:
+	db $04
+; Sprite OAM Parameters
+	db $00, $00, $04, $00                                      ; top left
+	db $00, $08, $05, $00                                      ; top right
+	db $08, $00, $06, OAMFLAG_CANBEMASKED                      ; bottom left
+	db $08, $08, $07, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA  ; bottom right
+
+.WalkingUp:
+	db $04
+; Sprite OAM Parameters
+	db $00, $00, $84, $00                                      ; top left
+	db $00, $08, $85, $00                                      ; top right
+	db $08, $00, $86, OAMFLAG_CANBEMASKED                      ; bottom left
+	db $08, $08, $87, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA  ; bottom right
+
+.WalkingUp2:
+	db $04
+; Sprite OAM Parameters
+	db $00, $08, $84, OAM_HFLIP                                           ; top left
+	db $00, $00, $85, OAM_HFLIP                                           ; top right
+	db $08, $08, $86, OAM_HFLIP | OAMFLAG_CANBEMASKED                     ; bottom left
+	db $08, $00, $87, OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right
+
+.StandingLeft:
+	db $04
+; Sprite OAM Parameters
+	db $00, $00, $08, $00                                      ; top left
+	db $00, $08, $09, $00                                      ; top right
+	db $08, $00, $0a, OAMFLAG_CANBEMASKED                      ; bottom left
+	db $08, $08, $0b, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA  ; bottom right
+
+.WalkingLeft:
+	db $04
+; Sprite OAM Parameters
+	db $00, $00, $88, $00                                      ; top left
+	db $00, $08, $89, $00                                      ; top right
+	db $08, $00, $8a, OAMFLAG_CANBEMASKED                      ; bottom left
+	db $08, $08, $8b, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA  ; bottom right
+
+.StandingRight:
+	db $04
+; Sprite OAM Parameters
+	db $00, $08, $08, OAM_HFLIP                                           ; top left
+	db $00, $00, $09, OAM_HFLIP                                           ; top right
+	db $08, $08, $0a, OAM_HFLIP | OAMFLAG_CANBEMASKED                     ; bottom left
+	db $08, $00, $0b, OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right
+
+.WalkingRight:
+	db $04
+; Sprite OAM Parameters
+	db $00, $08, $88, OAM_HFLIP                                           ; top left
+	db $00, $00, $89, OAM_HFLIP                                           ; top right
+	db $08, $08, $8a, OAM_HFLIP | OAMFLAG_CANBEMASKED                     ; bottom left
+	db $08, $00, $8b, OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right
+
+SpriteSpecialCase:
+	db $09
+; Sprite OAM Parameters
+	db -$4, -$4, $00, $00
+	db -$4, $04, $01, $00
+	db -$4, $0c, $00, OAM_HFLIP
+	db $04, -$4, $01, $00
+	db $04, $04, $02, $00
+	db $04, $0c, $01, $00
+	db $0c, -$4, $00, OAM_VFLIP | OAMFLAG_CANBEMASKED
+	db $0c, $04, $01, OAMFLAG_CANBEMASKED
+	db $0c, $0c, $00, OAM_VFLIP | OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA
diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm
new file mode 100644
index 00000000..b7bee609
--- /dev/null
+++ b/data/sprites/sprites.asm
@@ -0,0 +1,90 @@
+overworld_sprite: MACRO
+	dw \1
+	db \2 tiles
+	db BANK(\1)
+ENDM
+
+SpriteSheetPointerTable:
+	; graphics, tile count
+	overworld_sprite RedSprite, 12              ; SPRITE_RED
+	overworld_sprite BlueSprite, 12             ; SPRITE_BLUE
+	overworld_sprite OakSprite, 12              ; SPRITE_OAK
+	overworld_sprite YoungsterSprite, 12        ; SPRITE_YOUNGSTER
+	overworld_sprite MonsterSprite, 12          ; SPRITE_MONSTER
+	overworld_sprite CooltrainerFSprite, 12     ; SPRITE_COOLTRAINER_F
+	overworld_sprite CooltrainerMSprite, 12     ; SPRITE_COOLTRAINER_M
+	overworld_sprite LittleGirlSprite, 12       ; SPRITE_LITTLE_GIRL
+	overworld_sprite BirdSprite, 12             ; SPRITE_BIRD
+	overworld_sprite MiddleAgedManSprite, 12    ; SPRITE_MIDDLE_AGED_MAN
+	overworld_sprite GamblerSprite, 12          ; SPRITE_GAMBLER
+	overworld_sprite SuperNerdSprite, 12        ; SPRITE_SUPER_NERD
+	overworld_sprite GirlSprite, 12             ; SPRITE_GIRL
+	overworld_sprite HikerSprite, 12            ; SPRITE_HIKER
+	overworld_sprite BeautySprite, 12           ; SPRITE_BEAUTY
+	overworld_sprite GentlemanSprite, 12        ; SPRITE_GENTLEMAN
+	overworld_sprite DaisySprite, 12            ; SPRITE_DAISY
+	overworld_sprite BikerSprite, 12            ; SPRITE_BIKER
+	overworld_sprite SailorSprite, 12           ; SPRITE_SAILOR
+	overworld_sprite CookSprite, 12             ; SPRITE_COOK
+	overworld_sprite BikeShopClerkSprite, 12    ; SPRITE_BIKE_SHOP_CLERK
+	overworld_sprite MrFujiSprite, 12           ; SPRITE_MR_FUJI
+	overworld_sprite GiovanniSprite, 12         ; SPRITE_GIOVANNI
+	overworld_sprite RocketSprite, 12           ; SPRITE_ROCKET
+	overworld_sprite ChannelerSprite, 12        ; SPRITE_CHANNELER
+	overworld_sprite WaiterSprite, 12           ; SPRITE_WAITER
+	overworld_sprite ErikaSprite, 12            ; SPRITE_ERIKA
+	overworld_sprite MiddleAgedWomanSprite, 12  ; SPRITE_MIDDLE_AGED_WOMAN
+	overworld_sprite BrunetteGirlSprite, 12     ; SPRITE_BRUNETTE_GIRL
+	overworld_sprite LanceSprite, 12            ; SPRITE_LANCE
+	overworld_sprite RedSprite, 12              ; SPRITE_UNUSED_SCIENTIST
+	overworld_sprite ScientistSprite, 12        ; SPRITE_SCIENTIST
+	overworld_sprite RockerSprite, 12           ; SPRITE_ROCKER
+	overworld_sprite SwimmerSprite, 12          ; SPRITE_SWIMMER
+	overworld_sprite SafariZoneWorkerSprite, 12 ; SPRITE_SAFARI_ZONE_WORKER
+	overworld_sprite GymGuideSprite, 12         ; SPRITE_GYM_GUIDE
+	overworld_sprite GrampsSprite, 12           ; SPRITE_GRAMPS
+	overworld_sprite ClerkSprite, 12            ; SPRITE_CLERK
+	overworld_sprite FishingGuruSprite, 12      ; SPRITE_FISHING_GURU
+	overworld_sprite GrannySprite, 12           ; SPRITE_GRANNY
+	overworld_sprite NurseSprite, 12            ; SPRITE_NURSE
+	overworld_sprite LinkReceptionistSprite, 12 ; SPRITE_LINK_RECEPTIONIST
+	overworld_sprite SilphPresidentSprite, 12   ; SPRITE_SILPH_PRESIDENT
+	overworld_sprite SilphWorkerSprite, 12      ; SPRITE_SILPH_WORKER
+	overworld_sprite WardenSprite, 12           ; SPRITE_WARDEN
+	overworld_sprite CaptainSprite, 12          ; SPRITE_CAPTAIN
+	overworld_sprite FisherSprite, 12           ; SPRITE_FISHER
+	overworld_sprite KogaSprite, 12             ; SPRITE_KOGA
+	overworld_sprite GuardSprite, 12            ; SPRITE_GUARD
+	overworld_sprite RedSprite, 12              ; SPRITE_UNUSED_GUARD
+	overworld_sprite MomSprite, 12              ; SPRITE_MOM
+	overworld_sprite BaldingGuySprite, 12       ; SPRITE_BALDING_GUY
+	overworld_sprite LittleBoySprite, 12        ; SPRITE_LITTLE_BOY
+	overworld_sprite RedSprite, 12              ; SPRITE_UNUSED_GAMEBOY_KID
+	overworld_sprite GameboyKidSprite, 12       ; SPRITE_GAMEBOY_KID
+	overworld_sprite FairySprite, 12            ; SPRITE_FAIRY
+	overworld_sprite AgathaSprite, 12           ; SPRITE_AGATHA
+	overworld_sprite BrunoSprite, 12            ; SPRITE_BRUNO
+	overworld_sprite LoreleiSprite, 12          ; SPRITE_LORELEI
+	overworld_sprite SeelSprite, 12             ; SPRITE_SEEL
+	overworld_sprite PikachuSprite, 12          ; SPRITE_PIKACHU
+	overworld_sprite OfficerJennySprite, 12     ; SPRITE_OFFICER_JENNY
+	overworld_sprite SandshrewSprite, 12        ; SPRITE_SANDSHREW
+	overworld_sprite OddishSprite, 12           ; SPRITE_ODDISH
+	overworld_sprite BulbasaurSprite, 12        ; SPRITE_BULBASAUR
+	overworld_sprite JigglypuffSprite, 12       ; SPRITE_JIGGLYPUFF
+	overworld_sprite ClefairySprite, 12         ; SPRITE_CLEFAIRY
+	overworld_sprite ChanseySprite, 12          ; SPRITE_CHANSEY
+	overworld_sprite JessieSprite, 12           ; SPRITE_JESSIE
+	overworld_sprite JamesSprite, 12            ; SPRITE_JAMES
+	overworld_sprite PokeBallSprite, 4          ; SPRITE_POKE_BALL
+	overworld_sprite FossilSprite, 4            ; SPRITE_FOSSIL
+	overworld_sprite BoulderSprite, 4           ; SPRITE_BOULDER
+	overworld_sprite PaperSprite, 4             ; SPRITE_PAPER
+	overworld_sprite PokedexSprite, 4           ; SPRITE_POKEDEX
+	overworld_sprite ClipboardSprite, 4         ; SPRITE_CLIPBOARD
+	overworld_sprite SnorlaxSprite, 4           ; SPRITE_SNORLAX
+	overworld_sprite OldAmberSprite, 4          ; SPRITE_UNUSED_OLD_AMBER
+	overworld_sprite OldAmberSprite, 4          ; SPRITE_OLD_AMBER
+	overworld_sprite GamblerAsleepSprite, 4     ; SPRITE_UNUSED_GAMBLER_ASLEEP_1
+	overworld_sprite GamblerAsleepSprite, 4     ; SPRITE_UNUSED_GAMBLER_ASLEEP_2
+	overworld_sprite GamblerAsleepSprite, 4     ; SPRITE_GAMBLER_ASLEEP