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

Merge branch 'mistress' into renewables

Browse source
This commit is contained in:
Thorn Avery 2023-12-21 15:26:00 +11:00
parent bfc9b6f19d b1feca4361
commit 945abcef1e
13 changed files with 107 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/maps/dungeon_maps.asm
View file

@ -19,6 +19,7 @@ DungeonMaps1:
db GARNET_CAVERN_2F
db GARNET_CAVERN_1F
db GARNET_CAVERN_B1F
db MT_MOON_CRATER
db -1 ; end
; GetBattleTransitionID_IsDungeonMap checks if wCurMap

7
data/maps/objects/MtMoonB1F.asm
View file

@ -11,9 +11,12 @@ MtMoonB1F_Object:
warp_event 23, 3, MT_MOON_B2F, 4
warp_event 27, 3, ROUTE_4, 3
warp_event 1, 27, MT_MOON_B2F, 5
warp_event 1, 9, MT_MOON_SQUARE, 1
warp_event 1, 13, MT_MOON_SQUARE, 1
warp_event 1, 23, MT_MOON_SQUARE, 4
warp_event 1, 13, MT_MOON_1F, 6
warp_event 1, 17, MT_MOON_1F, 6
warp_event 5, 27, MT_MOON_SQUARE, 2
warp_event 1, 3, MT_MOON_CRATER, 1
warp_event 1, 7, ROUTE_4, 4
def_bg_events

5
data/maps/objects/MtMoonCrater.asm
View file

@ -2,14 +2,13 @@ MtMoonCrater_Object:
db $03 ; border block
def_warp_events
warp_event 23, 49, MT_MOON_SQUARE, 2
warp_event 22, 49, MT_MOON_SQUARE, 2
warp_event 46, 47, MT_MOON_B1F, 14
def_bg_events
def_object_events
object_event 33, 17, SPRITE_FOSSIL, STAY, NONE, 1, DOME_FOSSIL
object_event 31, 32, SPRITE_FOSSIL, STAY, NONE, 2, WING_FOSSIL
object_event 32, 32, SPRITE_FOSSIL, STAY, NONE, 2, WING_FOSSIL
object_event 33, 16, SPRITE_FOSSIL, STAY, NONE, 3, HELIX_FOSSIL
object_event 45, 24, SPRITE_POKE_BALL, STAY, NONE, 4, MAX_ETHER

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

@ -3,7 +3,7 @@ MtMoonSquare_Object:
def_warp_events
warp_event 16, 3, MT_MOON_B1F, 10
warp_event 22, 1, MT_MOON_CRATER, 1
warp_event 22, 1, MT_MOON_B1F, 13
warp_event 11, 5, MT_MOON_SQUARE_HOUSE, 1
warp_event 20, 9, MT_MOON_B1F, 11

1
data/maps/objects/Route4.asm
View file

@ -5,6 +5,7 @@ Route4_Object:
warp_event 11, 5, MT_MOON_POKECENTER, 1
warp_event 18, 5, MT_MOON_1F, 1
warp_event 24, 5, MT_MOON_B1F, 8
warp_event 50, 1, MT_MOON_B1F, 15
def_bg_events
bg_event 12, 5, 6 ; PokeCenterSignText

2
data/maps/special_warps.asm
View file

@ -14,6 +14,7 @@ DungeonWarpList:
db POKEMON_MANSION_1F, 1
db POKEMON_MANSION_1F, 2
db POKEMON_MANSION_2F, 3
db MT_MOON_CRATER, 1
db -1 ; end
@ -36,6 +37,7 @@ DungeonWarpData:
fly_warp POKEMON_MANSION_1F, 16, 14
fly_warp POKEMON_MANSION_1F, 16, 14
fly_warp POKEMON_MANSION_2F, 18, 14
fly_warp MT_MOON_CRATER, 21, 46
MACRO special_warp_spec

BIN
gfx/blocksets/cavern.bst
View file

Binary file not shown.

2
maps/MtMoonB1F.blk
View file

@ -1 +1 @@
?????<==???????==<<?????????=<?=??????<<
?????<?<===??????=?<=?????????=<<???=<19>??????<=<

4
maps/MtMoonCrater.blk
View file

@ -1,5 +1,5 @@
AAAAAAAAAAAAAAAAAAAAAAAAAACEEEEEEEEEEEEEEEEEEEE?AAABbCF,5 
 DD?AABCF//
 D@AABF9 ),@ACF,<=========>)@AB<JCEEE?AAAAK>)@AK><JCF}}DEEEE?K>@AAB)@CF$%,\QQQq@AB @AAB)@BZ--v=JAB@AAB@B"#rk-zG?AB @AAB@K=>,012@AB @AAB.@AAB%_@AB @AAB)@ACF)<=====JCF@AAB.@AB,@ACEE?ABD?AB@AB7@CF€D?B@AB@AB 6DFF)DDF<==JAB@AB 5,DE?AAB @AB
 D@AABF9 ),@ACF,<=========>)@AB<JCEEE?AAAAK>)@AK><JCF}}DEEEE?K>@AAB)@CF$%,\QQQQ@AB @AAB)@BZ--v=JAB@AAB@B"#rk-zG?AB @AAB@K=>,012@AB @AAB.@AAB%_@AB @AAB)@ACF)<=====JCF@AAB.@AB,@ACEE?ABD?AB@AB7@CF€D?B@AB@AB 6DF)DF<==JAB@AB 5,DE?AAB @AB
6,DD?AB
D?K==========><>@AB,@D?AAAAAAAAAAB@K>@AB|DEDEEEEEEEEESFDGF=>@AB,.}},.@AAAAACF@AB,||)DEEEEEFF@AK=======>Y<===========
D?K============>@AB,@DE?AACEEE?AAC?K>@AB|DEFDEEFD?CFDGF>@AB,.}},.@ABDGEF.@AB,||)DEEF,g@AK======================A

13
maps/Route4.blk
View file

@ -1,8 +1,7 @@
,,,,+WW*,,,,,,,,,+WWWWWWWWWWWWWWWWWWWWWW*,,,,,+WW% !$*,,,,,,,,)
,,,,+WW*,,,,,,,,,+WWWWWWWWWWWWWWWWWWWWW*,,,,,+WW% !$*,,,,,,,,)
X
YY
X
XY
X
X
@ -12,8 +11,7 @@ X
1111$WWWW,)|r$*+WWWW%
Z/[Y
X
Z[
X
Zaaaaa,)()11
@ -24,11 +22,10 @@ Zaaaaa,)()11
Y
X
Z/g,)()/[
Z/o\kkkk,)()
Z/g,)()/[
Z/o\kkkk,)()

1
ram/wram.asm
View file

@ -2141,6 +2141,7 @@ wChannel7:: channel_struct wChannel7
wChannel8:: channel_struct wChannel8
ENDU
wBTStreakCnt:: db
wBTRewards:: db
wObtainedHiddenItemsFlags:: flag_array 112

102
scripts/BattleTent.asm
View file

@ -322,6 +322,9 @@ BattleTent_InitBattle:
ld [wBattleTentCurScript], a
ret
BTBattleReward:
db $00, $20, $00
BattleTent_AfterBattle:
ld a, $ff
ld [wJoyIgnore], a
@ -338,8 +341,8 @@ BattleTent_AfterBattle:
cp $FF
jr z, .max ; cap out at 255 wins
inc a
.max
ld [wBTStreakCnt], a ; increment win counter
.max
jr .skip2
.skip
ld a, 1 ; lost last match
@ -582,28 +585,56 @@ BattleTentGuy:
ld [wBattleTentCurScript], a
jp TextScriptEnd
BTReward:
db $03,$00,$00
BattleTentGuy_After:
db $8
ld a, [wBTCont]
cp 2 ; voluntarily exited
ld hl, BattleTentLost
jr nz, .skip ; Not Teh Urn BibleThump
ld a, $03 ; NO REVERTING THIS CODE PIGU IM SICK OF YOU BREAKING IT!
ldh [$9f], a
ld a, $00
ldh [$a1], a
ld a, $00
ldh [$a0], a
ld hl, $ffa1
ld de, wPlayerMoney + 2
ld c, $3
predef AddBCDPredef
jr nz, .skip
ld hl, BattleTentWon
.skip
call PrintText
; give reward
; every ten battles gives a bottle cap
; every five gives a rare candy
ld a, [wBTStreakCnt]
ld c, 0 ; fives count
.findFive:
cp 5
jr nc, .hasFive
jr .done
.hasFive:
sub 5
inc c
jr .findFive
.done:
ld a, c
and a
jr z, .skip ; skip if no rewards
ld [wBTRewards], a
ld hl, ReceivedRewardPreamble
call PrintText
ld a, [wBTRewards]
ld b, RARE_CANDY
call GiveItem
jr nc, .bag_full ; could use money instead here
ld hl, ReceivedRewardText
call PrintText
ld a, [wBTRewards]
srl a
and a
jr z, .skip
ld [wBTRewards], a
;ld b, POWER_FEED
ld b, BOTTLE_CAP
call GiveItem
jr nc, .bag_full
ld hl, ReceivedRewardText
call PrintText
jr .skip
.bag_full:
ld hl, RewardNoRoomText
call PrintText
.skip:
ld hl, BattleTentPleaseWait
call PrintText
call BattleTent_RestoreTeam
@ -635,6 +666,7 @@ BattleTentGuy2:
and a
jr nz, .refused ; If 0, move to refused.
ld hl, BattleTentGuy2_Streak ; The message has been changed appropriately down below.
call PrintText
jr .done
.init
ld hl, BattleTentGuy2_Init ; Load the next battle.
@ -789,11 +821,10 @@ BattleTentWon:
text "Wow! You finally"
line "did it!"
para "Here is the"
line "reward!"
para $52, " received"
line "¥30000!"
para "You beat"
line "@"
text_decimal wBTStreakCnt, 1, 3
text " oppenont(s)!"
prompt
BattleTentLost:
@ -841,10 +872,10 @@ BattleTentGuy2_Win:
;text "Congratulations!"
text "Well done!"
para "You defeated"
line "@"
text_decimal wBTStreakCnt, 1, 3
text " opponent(s)!"
;para "You defeated"
;line "@"
;text_decimal wBTStreakCnt, 1, 3
;text " opponent(s)!"
para "Please go back to"
line "the counter to"
@ -857,6 +888,27 @@ BattleTentGuy2_Heal:
cont "full health."
done
ReceivedRewardPreamble:
text "Take these"
line "on the house!"
prompt
text_end
ReceivedRewardText:
text "<PLAYER> received"
line "@"
text_decimal wBTRewards, 1, 2
text "x @"
text_ram wStringBuffer
text "!"
prompt
text_end
RewardNoRoomText:
text "You have no room!"
prompt
text_end
; Battle Tent
BattleTentMart::
script_mart FULL_RESTORE, MAX_REVIVE, FULL_HEAL, BOTTLE_CAP, POKE_DOLL, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL, GUARD_SPEC

9
scripts/MtMoonB1F.asm
View file

@ -1,6 +1,13 @@
MtMoonB1F_Script:
call EnableAutoTextBoxDrawing
ret
ld a, MT_MOON_CRATER
ld [wDungeonWarpDestinationMap], a
ld hl, MtMoonHolesCoords
jp IsPlayerOnDungeonWarp
MtMoonHolesCoords:
dbmapcoord 6, 23
db -1 ; end
MtMoonB1F_TextPointers:
dw MtMoonText1