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

So it "works"...

Browse source 
This now, technically, works.

However, the Battle Tent was seemingly made with the assumption trainers are Pokemon, which our hack has moved from. I've made it so it can load it as a trainer battle properly, but you will deathwarp. I need to implement a scripted loss system.
This commit is contained in:
Llinos Evans 2023-05-13 19:07:16 +01:00
parent e7c6cc9dcc
commit 4de0a13543
5 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,7 @@ BattleTent_Object: ; 0x1dd9b (size=38)
object_event 2, 14, SPRITE_WAITER, STAY, DOWN, 1 ; person object_event 2, 14, SPRITE_WAITER, STAY, DOWN, 1 ; person
object_event 7, 14, SPRITE_CLERK, STAY, DOWN, 2 ; person object_event 7, 14, SPRITE_CLERK, STAY, DOWN, 2 ; person
object_event 2, 4, SPRITE_WAITER, STAY, RIGHT, 3 ; person object_event 2, 4, SPRITE_WAITER, STAY, RIGHT, 3 ; person
object_event 9, 4, SPRITE_YOUNGSTER, STAY, LEFT, 4 ; person object_event 10, 4, SPRITE_YOUNGSTER, STAY, LEFT, 4 ; person
def_warps_to BATTLE_TENT def_warps_to BATTLE_TENT

12
engine/battletentdata.asm
View file

@ -1,29 +1,29 @@
;btlibs ;btlibs
BTLib1:: BTLib1:
db "ready@@@@" db "ready@@@@"
db "prepared@" db "prepared@"
db "excited@@" db "excited@@"
db "hyped@@@@" db "hyped@@@@"
BTLib2:: BTLib2:
db "go@@@@@" db "go@@@@@"
db "do it@@" db "do it@@"
db "battle@" db "battle@"
db "rock@@@" db "rock@@@"
BTLib3:: BTLib3:
db "Oh no@@@@@" db "Oh no@@@@@"
db "Argh no@@@" db "Argh no@@@"
db "Oh well@@@" db "Oh well@@@"
db "My streak@" db "My streak@"
BTLib4:: BTLib4:
db "game@@@" db "game@@@"
db "battle@" db "battle@"
db "play@@@" db "play@@@"
db "job@@@@" db "job@@@@"
BTBeforeBattlePtrTable:: BTBeforeBattlePtrTable:
dw BTBeforeBattleTemplate1 dw BTBeforeBattleTemplate1
dw BTBeforeBattleTemplate2 dw BTBeforeBattleTemplate2
dw BTBeforeBattleTemplate3 dw BTBeforeBattleTemplate3
@ -33,7 +33,7 @@ BTBeforeBattlePtrTable::
dw BTBeforeBattleTemplate7 dw BTBeforeBattleTemplate7
dw BTBeforeBattleTemplate8 dw BTBeforeBattleTemplate8
BTAfterBattlePtrTable:: BTAfterBattlePtrTable:
dw BTAfterBattleTemplate1 dw BTAfterBattleTemplate1
dw BTAfterBattleTemplate2 dw BTAfterBattleTemplate2
dw BTAfterBattleTemplate3 dw BTAfterBattleTemplate3

3
engine/debug/debug_party.asm
View file

@ -71,8 +71,9 @@ IF DEF(_DEBUG)
ld [hl], a ld [hl], a
; Jolteon (Pokemon 3) gets Thunderbolt. ; Jolteon (Pokemon 3) gets Thunderbolt.
; Adjusted for Trampel
ld hl, wPartyMon3Moves + 3 ld hl, wPartyMon3Moves + 3
ld a, THUNDERBOLT ld a, EARTHQUAKE
ld [hl], a ld [hl], a
ld hl, wPartyMon3PP + 3 ld hl, wPartyMon3PP + 3
ld a, 15 ld a, 15

1
main.asm
View file

@ -362,7 +362,6 @@ SECTION "Engine Spillover", ROMX
INCLUDE "engine/menus/item_descriptions.asm" INCLUDE "engine/menus/item_descriptions.asm"
INCLUDE "engine/items/tm_prices.asm" INCLUDE "engine/items/tm_prices.asm"
INCLUDE "engine/battletentdata.asm"
_PartyMenuBattleTentText:: _PartyMenuBattleTentText::
text "Select which" text "Select which"

9
scripts/BattleTent.asm
View file

@ -643,6 +643,14 @@ BattleTentTrainer:
ld l, e ld l, e
ld h, d ld h, d
call PrintText call PrintText
ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld [wBTClass], a
ld a, 1
ld [wIsTrainerBattle], a
jp TextScriptEnd jp TextScriptEnd
BattleTentTrainer_After: BattleTentTrainer_After:
@ -800,3 +808,4 @@ BattleTentGuy2_Heal:
BattleTentMart:: BattleTentMart::
script_mart POTION, SUPER_POTION, HYPER_POTION, REVIVE, FULL_HEAL, POKE_DOLL, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL script_mart POTION, SUPER_POTION, HYPER_POTION, REVIVE, FULL_HEAL, POKE_DOLL, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL
INCLUDE "engine/battletentdata.asm"