So it "works"...

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.

data/maps/objects/BattleTent.asm

@@ -11,7 +11,7 @@ BattleTent_Object: ; 0x1dd9b (size=38)
 	object_event  2, 14, SPRITE_WAITER, STAY, DOWN, 1 ; person
 	object_event  7, 14, SPRITE_CLERK, STAY, DOWN, 2 ; 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

engine/battletentdata.asm

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

engine/debug/debug_party.asm

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

main.asm

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

scripts/BattleTent.asm

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