thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tauros.

Browse source 
Tauros.
This commit is contained in:
MementoMartha 2023-04-09 19:35:01 +01:00
parent c75f968931
commit a0cc8d52b0
6 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/maps/objects/SSAnne1F.asm
View file

@ -11,7 +11,7 @@ SSAnne1F_Object:
warp_event 11, 8, SS_ANNE_1F_ROOMS, 5 warp_event 11, 8, SS_ANNE_1F_ROOMS, 5
warp_event 7, 8, SS_ANNE_1F_ROOMS, 6 warp_event 7, 8, SS_ANNE_1F_ROOMS, 6
warp_event 2, 6, SS_ANNE_2F, 7 warp_event 2, 6, SS_ANNE_2F, 7
warp_event 37, 15, SS_ANNE_B1F, 6 warp_event 37, 15, SS_ANNE_B1F, 7
warp_event 3, 16, SS_ANNE_KITCHEN, 1 warp_event 3, 16, SS_ANNE_KITCHEN, 1
def_bg_events def_bg_events

2
data/maps/objects/SSAnne2FRooms.asm
View file

@ -23,7 +23,7 @@ SSAnne2FRooms_Object:
object_event 0, 14, SPRITE_GENTLEMAN, STAY, RIGHT, 3, OPP_GENTLEMAN, 5 object_event 0, 14, SPRITE_GENTLEMAN, STAY, RIGHT, 3, OPP_GENTLEMAN, 5
object_event 2, 11, SPRITE_COOLTRAINER_F, STAY, DOWN, 4, OPP_LASS, 12 object_event 2, 11, SPRITE_COOLTRAINER_F, STAY, DOWN, 4, OPP_LASS, 12
object_event 1, 2, SPRITE_GENTLEMAN, STAY, DOWN, 5 ; person object_event 1, 2, SPRITE_GENTLEMAN, STAY, DOWN, 5 ; person
object_event 12, 1, SPRITE_POKE_BALL, STAY, NONE, 6, MAX_ETHER ; object_event 12, 1, SPRITE_POKE_BALL, STAY, NONE, 6, MAX_ETHER
object_event 21, 2, SPRITE_GENTLEMAN, STAY, DOWN, 7 ; person object_event 21, 2, SPRITE_GENTLEMAN, STAY, DOWN, 7 ; person
object_event 22, 1, SPRITE_GRAMPS, STAY, DOWN, 8 ; person object_event 22, 1, SPRITE_GRAMPS, STAY, DOWN, 8 ; person
object_event 0, 12, SPRITE_POKE_BALL, STAY, NONE, 9, RARE_CANDY object_event 0, 12, SPRITE_POKE_BALL, STAY, NONE, 9, RARE_CANDY

8
data/maps/objects/SSAnneB1FRooms.asm
View file

@ -26,11 +26,11 @@ SSAnneB1FRooms_Object:
object_event 0, 4, SPRITE_FISHER, STAY, RIGHT, 6, OPP_FISHER, 2 object_event 0, 4, SPRITE_FISHER, STAY, RIGHT, 6, OPP_FISHER, 2
object_event 10, 13, SPRITE_SUPER_NERD, STAY, RIGHT, 7 ; person object_event 10, 13, SPRITE_SUPER_NERD, STAY, RIGHT, 7 ; person
object_event 11, 12, SPRITE_MONSTER, STAY, NONE, 8 ; person object_event 11, 12, SPRITE_MONSTER, STAY, NONE, 8 ; person
object_event 20, 2, SPRITE_POKE_BALL, STAY, NONE, 9, ETHER ; object_event 20, 2, SPRITE_POKE_BALL, STAY, NONE, 9, ETHER
object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_REST object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_REST
object_event 12, 11, SPRITE_POKE_BALL, STAY, NONE, 11, MAX_POTION object_event 12, 11, SPRITE_POKE_BALL, STAY, NONE, 11, MAX_POTION
object_event 23, 14, SPRITE_ROCKER, STAY, LEFT, 15 ; Tauros C Trader object_event 23, 14, SPRITE_ROCKER, STAY, LEFT, 12 ; Tauros C Trader
object_event 20, 13, SPRITE_ROCKER, STAY, RIGHT, 16 ; Tauros A Trader object_event 20, 13, SPRITE_ROCKER, STAY, RIGHT, 13 ; Tauros A Trader
object_event 22, 11, SPRITE_ROCKER, STAY, DOWN, 17 ; Tauros B Trader object_event 22, 11, SPRITE_ROCKER, STAY, DOWN, 14 ; Tauros B Trader
def_warps_to SS_ANNE_B1F_ROOMS def_warps_to SS_ANNE_B1F_ROOMS

2
data/pokemon/palettes.asm
View file

@ -209,7 +209,7 @@ MonsterPalettes:
db PAL_GREYMON ; TRAMPEL db PAL_GREYMON ; TRAMPEL
db PAL_BROWNMON ; TAUROS db PAL_BROWNMON ; TAUROS
db PAL_GREYMON ; TAUROS_P db PAL_GREYMON ; TAUROS_P
db PAL_BLUEMON ; TAUROS_PA db PAL_CYANMON ; TAUROS_PA
db PAL_REDMON ; TAUROS_PB db PAL_REDMON ; TAUROS_PB
db PAL_PINKMON ; CHANSEY db PAL_PINKMON ; CHANSEY
db PAL_PINKMON ; BLISSEY db PAL_PINKMON ; BLISSEY

2
data/text/text_7.asm
View file

@ -226,7 +226,7 @@ _WannaTrade7Text::
line "The Aqua Breed" line "The Aqua Breed"
cont "is superior." cont "is superior."
text "Surely you agree." para "Surely you agree."
line "Trade me your" line "Trade me your"
cont "TAUROS!" cont "TAUROS!"
done done

7
scripts/VermilionDock.asm
View file

@ -1,7 +1,5 @@
VermilionDock_Script: VermilionDock_Script:
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
ld de, VermilionDock_ScriptPointers
call ExecuteCurMapScriptInTable
CheckEventHL EVENT_STARTED_WALKING_OUT_OF_DOCK CheckEventHL EVENT_STARTED_WALKING_OUT_OF_DOCK
jr nz, .asm_1db8d jr nz, .asm_1db8d
CheckEventReuseHL EVENT_GOT_HM01 CheckEventReuseHL EVENT_GOT_HM01
@ -38,11 +36,6 @@ VermilionDock_Script:
SetEventReuseHL EVENT_WALKED_OUT_OF_DOCK SetEventReuseHL EVENT_WALKED_OUT_OF_DOCK
ret ret
VermilionDock_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
VermilionDock_1db9b: VermilionDock_1db9b:
ld a, [wObtainedBadges] ld a, [wObtainedBadges]
bit 4, a ; after obtaining 4 badges the ship returns bit 4, a ; after obtaining 4 badges the ship returns