Document battle tower battle salon and multi corridor (#825)

Author: Viperio19

asm/macros/scrcmd.inc

@@ -31,6 +31,7 @@
 #include "generated/trainer_score_events.h"
 #include "generated/trainers.h"
 #include "constants/animation_tags.h"
+#include "constants/battle_tower.h"
 #include "constants/boat_cutscene.h"
 #include "constants/colors.h"
 #include "constants/elevator_dirs.h"
@@ -690,11 +691,11 @@
     .short \arg2
     .endm
 
-    .macro ScrCmd_06B arg0, arg1, arg2
+    .macro MoveCamera x, y, z
     .short 107
-    .short \arg0
-    .short \arg1
-    .short \arg2
+    .short \x
+    .short \y
+    .short \z
     .endm
 
     .macro ScrCmd_06C arg0, arg1
@@ -2743,12 +2744,12 @@
     .short \destVar
     .endm
 
-    .macro ScrCmd_1DE arg0, arg1, arg2, arg3
+    .macro GetBattleTowerPartnerSpeciesAndMove partnerID, monID, destVar1, destVar2
     .short 478
-    .short \arg0
-    .short \arg1
-    .short \arg2
-    .short \arg3
+    .short \partnerID
+    .short \monID
+    .short \destVar1
+    .short \destVar2
     .endm
 
     .macro ScrCmd_1DF arg0
@@ -2886,7 +2887,7 @@
     .short \partySlot
     .endm
 
-    .macro ScrCmd_1F8
+    .macro WaitForTransition
     .short 504
     .endm
 

generated/battle_tower_functions.txt

@@ -23,20 +23,20 @@ BATTLE_TOWER_FUNCTION_UNK_37
 BATTLE_TOWER_FUNCTION_UNK_38
 BATTLE_TOWER_FUNCTION_UNK_39
 BATTLE_TOWER_FUNCTION_UNK_40
-BATTLE_TOWER_FUNCTION_UNK_41
+BATTLE_TOWER_FUNCTION_GET_OPPONENT_OBJECT_ID
 BATTLE_TOWER_FUNCTION_UNK_42
 BATTLE_TOWER_FUNCTION_GET_CHALLENGE_MODE
 BATTLE_TOWER_FUNCTION_UNK_44
 BATTLE_TOWER_FUNCTION_UNK_45
 BATTLE_TOWER_FUNCTION_UNK_47 = 47
 BATTLE_TOWER_FUNCTION_UNK_48
 BATTLE_TOWER_FUNCTION_UNK_49
-BATTLE_TOWER_FUNCTION_UNK_50
-BATTLE_TOWER_FUNCTION_UNK_51
+BATTLE_TOWER_FUNCTION_SET_PARTNER_ID
+BATTLE_TOWER_FUNCTION_GET_PARTNER_ID
 BATTLE_TOWER_FUNCTION_UNK_52
 BATTLE_TOWER_FUNCTION_GET_SLOT_INDEX
 BATTLE_TOWER_FUNCTION_UNK_54
-BATTLE_TOWER_FUNCTION_UNK_55
+BATTLE_TOWER_FUNCTION_GET_PARTNER_PARAM
 BATTLE_TOWER_FUNCTION_UNK_56
 BATTLE_TOWER_FUNCTION_UNK_57
 BATTLE_TOWER_FUNCTION_UNK_58

generated/frontier_trainers.txt

@@ -0,0 +1,315 @@
+FRONTIER_TRAINER_YOUNGSTER_JIM
+FRONTIER_TRAINER_YOUNGSTER_ERROLL
+FRONTIER_TRAINER_YOUNGSTER_CASIMIR
+FRONTIER_TRAINER_LASS_CAMERON
+FRONTIER_TRAINER_LASS_PEACHES
+FRONTIER_TRAINER_LASS_YASMIN
+FRONTIER_TRAINER_SCHOOL_KID_FOSTER
+FRONTIER_TRAINER_SCHOOL_KID_KEN
+FRONTIER_TRAINER_SCHOOL_KID_OWEN
+FRONTIER_TRAINER_SCHOOL_KID_MARCY
+FRONTIER_TRAINER_SCHOOL_KID_SHELLY
+FRONTIER_TRAINER_SCHOOL_KID_ASPEN
+FRONTIER_TRAINER_RICH_BOY_MATT
+FRONTIER_TRAINER_RICH_BOY_ALVAN
+FRONTIER_TRAINER_RICH_BOY_ASA
+FRONTIER_TRAINER_LADY_ISABEL
+FRONTIER_TRAINER_LADY_NICHOLE
+FRONTIER_TRAINER_LADY_JUANITA
+FRONTIER_TRAINER_CAMPER_BERNARD
+FRONTIER_TRAINER_CAMPER_HERBERT
+FRONTIER_TRAINER_CAMPER_COLBERT
+FRONTIER_TRAINER_PICNICKER_MAGGIE
+FRONTIER_TRAINER_PICNICKER_MELANIE
+FRONTIER_TRAINER_PICNICKER_ANN
+FRONTIER_TRAINER_TUBER_MANFORD
+FRONTIER_TRAINER_TUBER_HANK
+FRONTIER_TRAINER_TUBER_PERCY
+FRONTIER_TRAINER_TUBER_DAKOTA
+FRONTIER_TRAINER_TUBER_JENNY
+FRONTIER_TRAINER_TUBER_TIA
+FRONTIER_TRAINER_GUITARIST_MALCOLM
+FRONTIER_TRAINER_GUITARIST_TAD
+FRONTIER_TRAINER_GUITARIST_CONCORD
+FRONTIER_TRAINER_IDOL_PENNY
+FRONTIER_TRAINER_IDOL_LANA
+FRONTIER_TRAINER_IDOL_CRIMSON
+FRONTIER_TRAINER_POKEFAN_EWAN
+FRONTIER_TRAINER_POKEFAN_KANE
+FRONTIER_TRAINER_POKEFAN_THEO
+FRONTIER_TRAINER_POKEFAN_ALEXIA
+FRONTIER_TRAINER_POKEFAN_LUNA
+FRONTIER_TRAINER_POKEFAN_CELENE
+FRONTIER_TRAINER_WAITER_CYAN
+FRONTIER_TRAINER_WAITER_INDIGO
+FRONTIER_TRAINER_WAITER_ORIN
+FRONTIER_TRAINER_WAITRESS_ASHLEY
+FRONTIER_TRAINER_WAITRESS_NOELLE
+FRONTIER_TRAINER_WAITRESS_KANDACE
+FRONTIER_TRAINER_BUG_CATCHER_FLOYD
+FRONTIER_TRAINER_BUG_CATCHER_HOFFMAN
+FRONTIER_TRAINER_BUG_CATCHER_AMADEUS
+FRONTIER_TRAINER_NINJA_BOY_SHIA
+FRONTIER_TRAINER_NINJA_BOY_VINCENT
+FRONTIER_TRAINER_NINJA_BOY_PIERRE
+FRONTIER_TRAINER_POKE_KID_ALICE
+FRONTIER_TRAINER_POKE_KID_ANITA
+FRONTIER_TRAINER_POKE_KID_ALLISON
+FRONTIER_TRAINER_FISHERMAN_KIEFER
+FRONTIER_TRAINER_FISHERMAN_BASIL
+FRONTIER_TRAINER_RUIN_MANIAC_HENRIK
+FRONTIER_TRAINER_RUIN_MANIAC_AUBRY
+FRONTIER_TRAINER_COLLECTOR_UPTON
+FRONTIER_TRAINER_COLLECTOR_EMIL
+FRONTIER_TRAINER_PARASOL_LADY_BRIDGET
+FRONTIER_TRAINER_PARASOL_LADY_BLANCHE
+FRONTIER_TRAINER_PARASOL_LADY_COLETTE
+FRONTIER_TRAINER_BEAUTY_TIFFANY
+FRONTIER_TRAINER_BEAUTY_BRITNEY
+FRONTIER_TRAINER_BEAUTY_HARMONY
+FRONTIER_TRAINER_AROMA_LADY_LUCY
+FRONTIER_TRAINER_AROMA_LADY_JACKIE
+FRONTIER_TRAINER_AROMA_LADY_KARA
+FRONTIER_TRAINER_GUITARIST_BERNIE
+FRONTIER_TRAINER_GUITARIST_CURTIS
+FRONTIER_TRAINER_BIRD_KEEPER_NANCY
+FRONTIER_TRAINER_BIRD_KEEPER_TRINITY
+FRONTIER_TRAINER_BIRD_KEEPER_SHAWNA
+FRONTIER_TRAINER_SAILOR_LAYTON
+FRONTIER_TRAINER_SAILOR_GODWIN
+FRONTIER_TRAINER_HIKER_EVERETT
+FRONTIER_TRAINER_HIKER_RAIDEN
+FRONTIER_TRAINER_IDOL_ADA
+FRONTIER_TRAINER_IDOL_ANNIE
+FRONTIER_TRAINER_IDOL_BASIA
+FRONTIER_TRAINER_JOGGER_STEVE
+FRONTIER_TRAINER_JOGGER_DAVE
+FRONTIER_TRAINER_WORKER_SHANE
+FRONTIER_TRAINER_WORKER_BENJI
+FRONTIER_TRAINER_RANCHER_PIERCE
+FRONTIER_TRAINER_RANCHER_ETIENNE
+FRONTIER_TRAINER_RANCHER_LEON
+FRONTIER_TRAINER_COWGIRL_DORIS
+FRONTIER_TRAINER_COWGIRL_PAISLEY
+FRONTIER_TRAINER_COWGIRL_LESLIE
+FRONTIER_TRAINER_CAMERAMAN_HUDSON
+FRONTIER_TRAINER_CAMERAMAN_XENON
+FRONTIER_TRAINER_CAMERAMAN_AMLETH
+FRONTIER_TRAINER_REPORTER_DOT
+FRONTIER_TRAINER_REPORTER_MARBLE
+FRONTIER_TRAINER_REPORTER_GINGHAM
+FRONTIER_TRAINER_CYCLIST_GASPAR
+FRONTIER_TRAINER_CYCLIST_IGNATIO
+FRONTIER_TRAINER_CYCLIST_KAYLENE
+FRONTIER_TRAINER_CYCLIST_KAYA
+FRONTIER_TRAINER_BLACK_BELT_CLEMENT
+FRONTIER_TRAINER_BLACK_BELT_MASON
+FRONTIER_TRAINER_BATTLE_GIRL_KODI
+FRONTIER_TRAINER_BATTLE_GIRL_AILEEN
+FRONTIER_TRAINER_BLACK_BELT_JERICHO
+FRONTIER_TRAINER_BLACK_BELT_HARRIS
+FRONTIER_TRAINER_BLACK_BELT_SOREN
+FRONTIER_TRAINER_BATTLE_GIRL_TRINA
+FRONTIER_TRAINER_BATTLE_GIRL_ALTA
+FRONTIER_TRAINER_BATTLE_GIRL_INGRID
+FRONTIER_TRAINER_VETERAN_BECK
+FRONTIER_TRAINER_VETERAN_ERIC
+FRONTIER_TRAINER_VETERAN_PADGETT
+FRONTIER_TRAINER_SOCIALITE_BARBARA
+FRONTIER_TRAINER_SOCIALITE_ISABEL
+FRONTIER_TRAINER_SOCIALITE_CARMEN
+FRONTIER_TRAINER_PSYCHIC_ALPHA
+FRONTIER_TRAINER_PSYCHIC_BETA
+FRONTIER_TRAINER_PSYCHIC_ESSIE
+FRONTIER_TRAINER_PSYCHIC_AMELIA
+FRONTIER_TRAINER_PSYCHIC_CELINE
+FRONTIER_TRAINER_PSYCHIC_JILLIAN
+FRONTIER_TRAINER_BREEDER_HOWARD
+FRONTIER_TRAINER_BREEDER_DERRELL
+FRONTIER_TRAINER_BREEDER_BALDWIN
+FRONTIER_TRAINER_BREEDER_ADRIANA
+FRONTIER_TRAINER_BREEDER_SONYA
+FRONTIER_TRAINER_BREEDER_TATYANA
+FRONTIER_TRAINER_GENTLEMAN_ZANTE
+FRONTIER_TRAINER_GENTLEMAN_GILIAM
+FRONTIER_TRAINER_ROUGHNECK_RODNEY
+FRONTIER_TRAINER_ROUGHNECK_RAINIER
+FRONTIER_TRAINER_SCIENTIST_JEAN
+FRONTIER_TRAINER_SCIENTIST_BRAD
+FRONTIER_TRAINER_CLOWN_FRANCIS
+FRONTIER_TRAINER_CLOWN_PRESCOT
+FRONTIER_TRAINER_ACE_TRAINER_YARDLEY
+FRONTIER_TRAINER_ACE_TRAINER_STAVROS
+FRONTIER_TRAINER_ACE_TRAINER_ZANE
+FRONTIER_TRAINER_ACE_TRAINER_KIM
+FRONTIER_TRAINER_ACE_TRAINER_MACY
+FRONTIER_TRAINER_ACE_TRAINER_FAUN
+FRONTIER_TRAINER_RANGER_DOYLE
+FRONTIER_TRAINER_RANGER_DUKE
+FRONTIER_TRAINER_RANGER_DEACON
+FRONTIER_TRAINER_RANGER_MENA
+FRONTIER_TRAINER_RANGER_MERCY
+FRONTIER_TRAINER_RANGER_EVITA
+FRONTIER_TRAINER_DRAGON_TAMER_HAROLD
+FRONTIER_TRAINER_DRAGON_TAMER_HERMAN
+FRONTIER_TRAINER_DRAGON_TAMER_EMMETT
+FRONTIER_TRAINER_DRAGON_TAMER_ERICH
+FRONTIER_TRAINER_ACE_TRAINER_GARVEY
+FRONTIER_TRAINER_ACE_TRAINER_CRUZ
+FRONTIER_TRAINER_ACE_TRAINER_PAMELA
+FRONTIER_TRAINER_ACE_TRAINER_DANIELA
+FRONTIER_TRAINER_YOUNGSTER_KADEN
+FRONTIER_TRAINER_YOUNGSTER_KOLBY
+FRONTIER_TRAINER_LASS_KARISSA
+FRONTIER_TRAINER_LASS_LILIANA
+FRONTIER_TRAINER_SCHOOL_KID_JONAS
+FRONTIER_TRAINER_SCHOOL_KID_KEON
+FRONTIER_TRAINER_SCHOOL_KID_CHELSIE
+FRONTIER_TRAINER_SCHOOL_KID_REGINA
+FRONTIER_TRAINER_RICH_BOY_DAULTON
+FRONTIER_TRAINER_RICH_BOY_HANSON
+FRONTIER_TRAINER_LADY_AMORY
+FRONTIER_TRAINER_LADY_JULIANA
+FRONTIER_TRAINER_BUG_CATCHER_CAMUI
+FRONTIER_TRAINER_BUG_CATCHER_ORLANDO
+FRONTIER_TRAINER_NINJA_BOY_ZACK
+FRONTIER_TRAINER_NINJA_BOY_VANCE
+FRONTIER_TRAINER_POKE_KID_KYLA
+FRONTIER_TRAINER_POKE_KID_RUBY
+FRONTIER_TRAINER_IDOL_KILEY
+FRONTIER_TRAINER_IDOL_UTAH
+FRONTIER_TRAINER_JOGGER_COLT
+FRONTIER_TRAINER_JOGGER_TORY
+FRONTIER_TRAINER_FISHERMAN_FARLEY
+FRONTIER_TRAINER_FISHERMAN_MARK
+FRONTIER_TRAINER_RUIN_MANIAC_SAMUEL
+FRONTIER_TRAINER_RUIN_MANIAC_PENN
+FRONTIER_TRAINER_COLLECTOR_MARQUEZ
+FRONTIER_TRAINER_COLLECTOR_ARNOLD
+FRONTIER_TRAINER_GUITARIST_FRED
+FRONTIER_TRAINER_GUITARIST_CHASE
+FRONTIER_TRAINER_BIRD_KEEPER_MCKENNA
+FRONTIER_TRAINER_BIRD_KEEPER_SALLY
+FRONTIER_TRAINER_SAILOR_CASPER
+FRONTIER_TRAINER_SAILOR_DERRIAN
+FRONTIER_TRAINER_HIKER_MONTY
+FRONTIER_TRAINER_HIKER_ROCKY
+FRONTIER_TRAINER_POLICEMAN_REGGIE
+FRONTIER_TRAINER_POLICEMAN_QUINCY
+FRONTIER_TRAINER_PI_NEIL
+FRONTIER_TRAINER_PI_SERGEI
+FRONTIER_TRAINER_CAMPER_FREDDY
+FRONTIER_TRAINER_CAMPER_ANDRE
+FRONTIER_TRAINER_PICNICKER_INGA
+FRONTIER_TRAINER_PICNICKER_TONYA
+FRONTIER_TRAINER_GUITARIST_TOBIAS
+FRONTIER_TRAINER_GUITARIST_CECIL
+FRONTIER_TRAINER_IDOL_MARANDA
+FRONTIER_TRAINER_IDOL_HELENE
+FRONTIER_TRAINER_POKEFAN_SIMON
+FRONTIER_TRAINER_POKEFAN_TURNER
+FRONTIER_TRAINER_POKEFAN_EUROPA
+FRONTIER_TRAINER_POKEFAN_PANDORA
+FRONTIER_TRAINER_RANCHER_VERN
+FRONTIER_TRAINER_RANCHER_BORIS
+FRONTIER_TRAINER_COWGIRL_CARLY
+FRONTIER_TRAINER_COWGIRL_GINGER
+FRONTIER_TRAINER_BREEDER_PETER
+FRONTIER_TRAINER_BREEDER_TYRON
+FRONTIER_TRAINER_BREEDER_ZORYA
+FRONTIER_TRAINER_BREEDER_ANTONIA
+FRONTIER_TRAINER_ACE_TRAINER_SAWYER
+FRONTIER_TRAINER_ACE_TRAINER_CHARLIE
+FRONTIER_TRAINER_ACE_TRAINER_CHLOE
+FRONTIER_TRAINER_ACE_TRAINER_DAPHNE
+FRONTIER_TRAINER_ACE_TRAINER_THAD
+FRONTIER_TRAINER_ACE_TRAINER_LEW
+FRONTIER_TRAINER_ACE_TRAINER_OPAL
+FRONTIER_TRAINER_ACE_TRAINER_LEDA
+FRONTIER_TRAINER_RANGER_GEOFF
+FRONTIER_TRAINER_RANGER_GUNTHER
+FRONTIER_TRAINER_RANGER_ALMA
+FRONTIER_TRAINER_RANGER_ELISE
+FRONTIER_TRAINER_DRAGON_TAMER_HARVEY
+FRONTIER_TRAINER_DRAGON_TAMER_NICOLAS
+FRONTIER_TRAINER_BLACK_BELT_FERGUS
+FRONTIER_TRAINER_BLACK_BELT_RONNI
+FRONTIER_TRAINER_BATTLE_GIRL_EVE
+FRONTIER_TRAINER_BATTLE_GIRL_MARIANE
+FRONTIER_TRAINER_VETERAN_COSTIN
+FRONTIER_TRAINER_VETERAN_ALFRED
+FRONTIER_TRAINER_SOCIALITE_RIOHA
+FRONTIER_TRAINER_SOCIALITE_JANICE
+FRONTIER_TRAINER_PSYCHIC_DENVER
+FRONTIER_TRAINER_PSYCHIC_BERKLEY
+FRONTIER_TRAINER_PSYCHIC_IRENE
+FRONTIER_TRAINER_PSYCHIC_SYLVIE
+FRONTIER_TRAINER_WAITER_XANDER
+FRONTIER_TRAINER_WAITER_WARREN
+FRONTIER_TRAINER_WAITRESS_LESLIE
+FRONTIER_TRAINER_WAITRESS_KATHY
+FRONTIER_TRAINER_CAMERAMAN_DARREN
+FRONTIER_TRAINER_CAMERAMAN_SKIP
+FRONTIER_TRAINER_REPORTER_KATIE
+FRONTIER_TRAINER_REPORTER_ELAINE
+FRONTIER_TRAINER_CYCLIST_CLIVE
+FRONTIER_TRAINER_CYCLIST_WARD
+FRONTIER_TRAINER_CYCLIST_HILDA
+FRONTIER_TRAINER_CYCLIST_VANITA
+FRONTIER_TRAINER_PI_RALPH
+FRONTIER_TRAINER_PI_CONWAY
+FRONTIER_TRAINER_IDOL_KRISTI
+FRONTIER_TRAINER_IDOL_TRISTA
+FRONTIER_TRAINER_JOGGER_AUSTIN
+FRONTIER_TRAINER_JOGGER_DIMITRI
+FRONTIER_TRAINER_FISHERMAN_DELANEY
+FRONTIER_TRAINER_FISHERMAN_KEATON
+FRONTIER_TRAINER_SAILOR_CARLO
+FRONTIER_TRAINER_SAILOR_HORATIO
+FRONTIER_TRAINER_HIKER_LYLE
+FRONTIER_TRAINER_HIKER_GLEN
+FRONTIER_TRAINER_RUIN_MANIAC_ISADORE
+FRONTIER_TRAINER_RUIN_MANIAC_WALTON
+FRONTIER_TRAINER_GUITARIST_ROGET
+FRONTIER_TRAINER_GUITARIST_IGGY
+FRONTIER_TRAINER_COLLECTOR_LEROY
+FRONTIER_TRAINER_COLLECTOR_NEWMAN
+FRONTIER_TRAINER_ROUGHNECK_ROSS
+FRONTIER_TRAINER_ROUGHNECK_RON
+FRONTIER_TRAINER_SCIENTIST_IRWIN
+FRONTIER_TRAINER_SCIENTIST_FLYNN
+FRONTIER_TRAINER_GENTLEMAN_JOACHIM
+FRONTIER_TRAINER_GENTLEMAN_KARSTON
+FRONTIER_TRAINER_WORKER_BOYCE
+FRONTIER_TRAINER_WORKER_TYRELL
+FRONTIER_TRAINER_CLOWN_FRANK
+FRONTIER_TRAINER_CLOWN_ENZO
+FRONTIER_TRAINER_POLICEMAN_HUGH
+FRONTIER_TRAINER_POLICEMAN_KEGAN
+FRONTIER_TRAINER_PI_CHESTER
+FRONTIER_TRAINER_PI_RIVER
+FRONTIER_TRAINER_BIRD_KEEPER_KIRA
+FRONTIER_TRAINER_BIRD_KEEPER_ELIZA
+FRONTIER_TRAINER_PARASOL_LADY_ANGIE
+FRONTIER_TRAINER_PARASOL_LADY_SAMI
+FRONTIER_TRAINER_BEAUTY_NADIA
+FRONTIER_TRAINER_BEAUTY_BECKY
+FRONTIER_TRAINER_AROMA_LADY_ELISHA
+FRONTIER_TRAINER_AROMA_LADY_AMBRE
+FRONTIER_TRAINER_IDOL_COCOA
+FRONTIER_TRAINER_IDOL_NISSA
+FRONTIER_TRAINER_TRAINER_CHERYL_CHERYL
+FRONTIER_TRAINER_TRAINER_MIRA_MIRA
+FRONTIER_TRAINER_TRAINER_RILEY_RILEY
+FRONTIER_TRAINER_TRAINER_MARLEY_MARLEY
+FRONTIER_TRAINER_TRAINER_BUCK_BUCK
+FRONTIER_TRAINER_TOWER_TYCOON_PALMER_SILVER
+FRONTIER_TRAINER_TOWER_TYCOON_PALMER_GOLD
+FRONTIER_TRAINER_HALL_MATRON_ARGENTA_SILVER
+FRONTIER_TRAINER_HALL_MATRON_ARGENTA_GOLD
+FRONTIER_TRAINER_FACTORY_HEAD_THORTON_SILVER
+FRONTIER_TRAINER_FACTORY_HEAD_THORTON_GOLD
+FRONTIER_TRAINER_ARCADE_STAR_DAHLIA_SILVER
+FRONTIER_TRAINER_ARCADE_STAR_DAHLIA_GOLD
+FRONTIER_TRAINER_CASTLE_VALET_DARACH_SILVER
+FRONTIER_TRAINER_CASTLE_VALET_DARACH_GOLD