Merge pull request #4 from DizzyEggg/help_garak

Finish porting battle frontier data
This commit is contained in:
garak 2018-12-05 16:24:37 -05:00 committed by GitHub
commit 7ee2f9f2e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 1859 additions and 2028 deletions

View File

@ -37,6 +37,11 @@ extern const u8 gTowerMaleFacilityClasses[30];
extern const u8 gTowerMaleTrainerGfxIds[30]; extern const u8 gTowerMaleTrainerGfxIds[30];
extern const u8 gTowerFemaleFacilityClasses[20]; extern const u8 gTowerFemaleFacilityClasses[20];
extern const u8 gTowerFemaleTrainerGfxIds[20]; extern const u8 gTowerFemaleTrainerGfxIds[20];
extern const u16 gBattleFrontierHeldItems[];
extern const struct FacilityMon gBattleFrontierMons[];
extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];
extern const struct FacilityMon gSlateportBattleTentMons[];
extern const struct BattleFrontierTrainer gSlateportBattleTentTrainers[];
extern u16 gUnknown_03006298[]; extern u16 gUnknown_03006298[];
@ -78,335 +83,4 @@ u8 sub_81660B8(u8 facilityClass);
bool32 ValidateBattleTowerRecord(u8 recordId); // unused bool32 ValidateBattleTowerRecord(u8 recordId); // unused
void sub_8166188(void); void sub_8166188(void);
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248297[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24459B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245CAC[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245FC6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247749[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246864[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247F3F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248661[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2469B4[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D9E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246662[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248321[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244F4F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2465B5[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2481E1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244549[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246244[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2468A7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245A5F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24626E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244383[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F7B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247268[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244643[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EE9[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247AA1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D6A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247348[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24522F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24617D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244989[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2470FD[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248467[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2474AF[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245BBD[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24503D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248553[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246741[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245656[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248725[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244939[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2471FB[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247291[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248614[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24777A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2455EC[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248031[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245464[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2484E7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247313[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247470[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246529[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247238[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247DFE[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E64[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247655[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245535[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246FCC[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2482DC[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247991[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246605[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B4C[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C05[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246020[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2471C7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246449[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246831[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247854[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246051[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2486C6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248401[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248671[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246EB6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247484[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2460D5[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244DC6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2485E5[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248BB4[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244B52[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24896F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247629[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244413[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C90[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24758B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2458CE[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248369[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245DC7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2483C1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248892[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2488D8[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247889[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248781[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246791[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246571[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248431[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2462AA[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2473FB[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245CE6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2487C9[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B9B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247807[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24636B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246002[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247838[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248151[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247942[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248751[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D07[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246BB2[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2489BD[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247724[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248908[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244618[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24468F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244C6E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467C4[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245406[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2474EC[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2480DC[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24857D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248517[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245087[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2463C5[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247AE3[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2470B2[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248221[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245196[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245740[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24480C[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24555F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247CB2[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248128[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244DFE[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247013[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24479E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2461C7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2466E6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2477CE[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2478DD[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248477[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244CD6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247E3E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245923[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248829[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2475BC[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245013[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246686[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247438[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D8D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246082[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2464EE[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247BE7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245EBD[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24697C[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A85[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245851[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A72[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248CCF[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24444B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C6C[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2472C7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245AB4[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24769B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246760[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246CB3[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248D04[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2451BD[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244AD6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246478[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D[];
#endif //GUARD_BATTLE_TOWER_H #endif //GUARD_BATTLE_TOWER_H

View File

@ -200,6 +200,8 @@
#define FACILITY_CLASS_RS_BRENDAN 0x50 #define FACILITY_CLASS_RS_BRENDAN 0x50
#define FACILITY_CLASS_RS_MAY 0x51 #define FACILITY_CLASS_RS_MAY 0x51
#define FACILITY_CLASSES_COUNT 0x52
#define TRAINER_CLASS_PKMN_TRAINER_1 0x0 #define TRAINER_CLASS_PKMN_TRAINER_1 0x0
#define TRAINER_CLASS_PKMN_TRAINER_2 0x1 #define TRAINER_CLASS_PKMN_TRAINER_2 0x1
#define TRAINER_CLASS_HIKER 0x2 #define TRAINER_CLASS_HIKER 0x2

View File

@ -1275,6 +1275,338 @@ extern const u8 gText_082C8589[];
extern const u8 gText_082C85AE[]; extern const u8 gText_082C85AE[];
extern const u8 gText_082C877B[]; extern const u8 gText_082C877B[];
// Battle Tower.
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248297[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24459B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245CAC[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245FC6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247749[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246864[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247F3F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248661[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2469B4[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D9E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246662[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248321[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244F4F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2465B5[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2481E1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244549[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246244[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2468A7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245A5F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24626E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244383[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F7B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247268[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244643[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EE9[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247AA1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D6A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247348[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24522F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24617D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244989[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2470FD[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248467[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2474AF[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245BBD[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24503D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248553[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246741[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245656[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248725[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244939[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2471FB[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247291[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248614[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24777A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2455EC[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248031[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245464[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2484E7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247313[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247470[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246529[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247238[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247DFE[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E64[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247655[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245535[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246FCC[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2482DC[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247991[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246605[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B4C[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C05[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246020[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2471C7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246449[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246831[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247854[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246051[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2486C6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248401[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248671[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246EB6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247484[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2460D5[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244DC6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2485E5[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248BB4[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244B52[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24896F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247629[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244413[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C90[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24758B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2458CE[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248369[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245DC7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2483C1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248892[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2488D8[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247889[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248781[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246791[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246571[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248431[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2462AA[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2473FB[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245CE6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2487C9[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B9B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247807[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24636B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246002[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247838[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248151[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247942[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248751[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D07[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246BB2[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2489BD[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247724[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248908[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244618[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24468F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244C6E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467C4[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245406[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2474EC[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2480DC[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24857D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248517[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245087[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2463C5[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247AE3[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2470B2[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248221[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245196[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245740[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24480C[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24555F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247CB2[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248128[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244DFE[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247013[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24479E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2461C7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2466E6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2477CE[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2478DD[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248477[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244CD6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247E3E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245923[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248829[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2475BC[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245013[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246686[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247438[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D8D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246082[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2464EE[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247BE7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245EBD[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24697C[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A85[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245851[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A72[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248CCF[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24444B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C6C[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2472C7[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245AB4[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24769B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246760[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246CB3[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248D04[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2451BD[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244AD6[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246478[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D[];
// Battle Pyramid. // Battle Pyramid.
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D2D[]; extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D2D[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D57[]; extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D57[];

View File

@ -26,6 +26,7 @@
#include "international_string_util.h" #include "international_string_util.h"
#include "trainer_pokemon_sprites.h" #include "trainer_pokemon_sprites.h"
#include "scanline_effect.h" #include "scanline_effect.h"
#include "script_pokemon_util_80F87D8.h"
#include "graphics.h" #include "graphics.h"
#include "constants/species.h" #include "constants/species.h"
#include "constants/moves.h" #include "constants/moves.h"
@ -57,19 +58,9 @@ struct UnkStruct_860DD10
}; };
extern void sub_81B8558(void); extern void sub_81B8558(void);
extern u16 GetFrontierBrainMonMove(u8 monId, u8 moveSlotId);
extern u8 GetFrontierBrainMonEvs(u8, u8);
extern u8 GetFrontierBrainMonNature(u8);
extern void sub_81A4C30(void);
extern u8 sub_81A3610(void);
extern u16 GetFrontierBrainMonSpecies(u8);
extern void ReducePlayerPartyToSelectedMons(void);
extern u8 gSelectedOrderFromParty[]; extern u8 gSelectedOrderFromParty[];
extern const u16 gBattleFrontierHeldItems[];
extern const struct FacilityMon gBattleFrontierMons[];
extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];
extern const struct SpriteTemplate gUnknown_0860CFA8; extern const struct SpriteTemplate gUnknown_0860CFA8;
// text // text

View File

@ -13,11 +13,6 @@
#include "constants/trainers.h" #include "constants/trainers.h"
#include "constants/moves.h" #include "constants/moves.h"
extern const struct FacilityMon gBattleFrontierMons[];
extern const struct FacilityMon gSlateportBattleTentMons[];
extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];
extern const u16 gBattleFrontierHeldItems[];
// IWRAM bss // IWRAM bss
static IWRAM_DATA bool8 gUnknown_03001288; static IWRAM_DATA bool8 gUnknown_03001288;

View File

@ -50,8 +50,6 @@ struct PikeWildMon
u16 moves[4]; u16 moves[4];
}; };
extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];
// IWRAM bss // IWRAM bss
static IWRAM_DATA u8 sRoomType; static IWRAM_DATA u8 sRoomType;
static IWRAM_DATA u8 sStatusMon; static IWRAM_DATA u8 sStatusMon;

View File

@ -37,9 +37,6 @@ extern void door_upload_tiles(void);
extern const struct MapLayout *const gMapLayouts[]; extern const struct MapLayout *const gMapLayouts[];
extern const u16 gUnknown_08D856C8[][16]; extern const u16 gUnknown_08D856C8[][16];
extern const u16 gBattleFrontierHeldItems[];
extern const struct FacilityMon gBattleFrontierMons[];
extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];
#define TOTAL_ROUNDS 20 #define TOTAL_ROUNDS 20
#define PICKUP_ITEMS_PER_ROUND 10 #define PICKUP_ITEMS_PER_ROUND 10

View File

@ -14,10 +14,6 @@
#include "constants/items.h" #include "constants/items.h"
#include "constants/region_map_sections.h" #include "constants/region_map_sections.h"
extern const struct BattleFrontierTrainer gSlateportBattleTentTrainers[];
extern const struct FacilityMon gSlateportBattleTentMons[];
extern const u16 gBattleFrontierHeldItems[];
// This file's functions. // This file's functions.
static void sub_81B99D4(void); static void sub_81B99D4(void);
static void sub_81B9A28(void); static void sub_81B9A28(void);

View File

@ -10,6 +10,7 @@
#include "international_string_util.h" #include "international_string_util.h"
#include "battle.h" #include "battle.h"
#include "frontier_util.h" #include "frontier_util.h"
#include "strings.h"
#include "recorded_battle.h" #include "recorded_battle.h"
#include "easy_chat.h" #include "easy_chat.h"
#include "gym_leader_rematch.h" #include "gym_leader_rematch.h"
@ -23,14 +24,13 @@
#include "tv.h" #include "tv.h"
#include "battle_factory.h" #include "battle_factory.h"
#include "constants/battle_frontier.h" #include "constants/battle_frontier.h"
#include "constants/items.h"
#include "constants/trainers.h" #include "constants/trainers.h"
#include "constants/event_objects.h" #include "constants/event_objects.h"
#include "constants/moves.h" #include "constants/moves.h"
#include "constants/species.h" #include "constants/species.h"
#include "constants/easy_chat.h" #include "constants/easy_chat.h"
extern void sub_81A4C30(void);
extern const u16 gUnknown_085DFA46[]; extern const u16 gUnknown_085DFA46[];
extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224157[]; extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224157[];
@ -76,7 +76,7 @@ static void SetEReaderTrainerChecksum(struct BattleTowerEReaderTrainer *ereaderT
static u8 SetTentPtrsGetLevel(void); static u8 SetTentPtrsGetLevel(void);
// Const rom data. // Const rom data.
const u16 gBattleFrontierHeldItems[] = const u16 gBattleFrontierHeldItems[] =
{ {
ITEM_NONE, ITEM_NONE,
ITEM_KINGS_ROCK, ITEM_KINGS_ROCK,
@ -147,7 +147,7 @@ const u16 gBattleFrontierHeldItems[] =
#include "data/battle_frontier/battle_frontier_trainers.h" #include "data/battle_frontier/battle_frontier_trainers.h"
#include "data/battle_frontier/battle_frontier_mons.h" #include "data/battle_frontier/battle_frontier_mons.h"
const u8 gTowerMaleFacilityClasses[] = const u8 gTowerMaleFacilityClasses[30] =
{ {
FACILITY_CLASS_RUIN_MANIAC, FACILITY_CLASS_RUIN_MANIAC,
FACILITY_CLASS_TUBER_M, FACILITY_CLASS_TUBER_M,
@ -181,7 +181,7 @@ const u8 gTowerMaleFacilityClasses[] =
FACILITY_CLASS_HIKER FACILITY_CLASS_HIKER
}; };
const u8 gTowerFemaleFacilityClasses[] = const u8 gTowerFemaleFacilityClasses[20] =
{ {
FACILITY_CLASS_AROMA_LADY, FACILITY_CLASS_AROMA_LADY,
FACILITY_CLASS_TUBER_F, FACILITY_CLASS_TUBER_F,
@ -205,7 +205,7 @@ const u8 gTowerFemaleFacilityClasses[] =
FACILITY_CLASS_LASS FACILITY_CLASS_LASS
}; };
const u8 gTowerMaleTrainerGfxIds[] = const u8 gTowerMaleTrainerGfxIds[30] =
{ {
EVENT_OBJ_GFX_HIKER, EVENT_OBJ_GFX_HIKER,
EVENT_OBJ_GFX_TUBER_M, EVENT_OBJ_GFX_TUBER_M,
@ -239,7 +239,7 @@ const u8 gTowerMaleTrainerGfxIds[] =
EVENT_OBJ_GFX_HIKER EVENT_OBJ_GFX_HIKER
}; };
const u8 gTowerFemaleTrainerGfxIds[] = const u8 gTowerFemaleTrainerGfxIds[20] =
{ {
EVENT_OBJ_GFX_WOMAN_2, EVENT_OBJ_GFX_WOMAN_2,
EVENT_OBJ_GFX_TUBER_F, EVENT_OBJ_GFX_TUBER_F,
@ -263,7 +263,7 @@ const u8 gTowerFemaleTrainerGfxIds[] =
EVENT_OBJ_GFX_LASS EVENT_OBJ_GFX_LASS
}; };
const u8 sRubyFacilityClassToEmerald[82][2] = static const u8 sRubyFacilityClassToEmerald[][2] =
{ {
{0x00, 0x0b}, {0x00, 0x0b},
{0x01, 0x01}, {0x01, 0x01},
@ -340,10 +340,9 @@ const u8 sRubyFacilityClassToEmerald[82][2] =
{0x4a, 0x48}, {0x4a, 0x48},
{0x4b, 0x49}, {0x4b, 0x49},
{0x4c, 0x4a}, {0x4c, 0x4a},
{0x00, 0x00}
}; };
const u8 *const gUnknown_085DCFD8[] = static const u8 *const gUnknown_085DCFD8[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_244383, BattleFrontier_BattleTowerMultiBattleRoom_Text_244383,
BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7, BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7,
@ -352,7 +351,7 @@ const u8 *const gUnknown_085DCFD8[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6 BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6
}; };
const u8 *const gUnknown_085DCFEC[] = static const u8 *const gUnknown_085DCFEC[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF, BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF,
BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E, BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E,
@ -361,7 +360,7 @@ const u8 *const gUnknown_085DCFEC[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5 BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5
}; };
const u8 *const gUnknown_085DD000[] = static const u8 *const gUnknown_085DD000[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8, BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8,
BattleFrontier_BattleTowerMultiBattleRoom_Text_244618, BattleFrontier_BattleTowerMultiBattleRoom_Text_244618,
@ -370,7 +369,7 @@ const u8 *const gUnknown_085DD000[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4 BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4
}; };
const u8 *const gUnknown_085DD014[] = static const u8 *const gUnknown_085DD014[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5, BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5,
BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D, BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D,
@ -379,7 +378,7 @@ const u8 *const gUnknown_085DD014[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7
}; };
const u8 *const gUnknown_085DD028[] = static const u8 *const gUnknown_085DD028[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD, BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD,
BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5, BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5,
@ -388,7 +387,7 @@ const u8 *const gUnknown_085DD028[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6 BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6
}; };
const u8 *const gUnknown_085DD03C[] = static const u8 *const gUnknown_085DD03C[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23, BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23,
BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9, BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9,
@ -397,7 +396,7 @@ const u8 *const gUnknown_085DD03C[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93 BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93
}; };
const u8 *const gUnknown_085DD050[] = static const u8 *const gUnknown_085DD050[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2, BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2,
BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18, BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18,
@ -406,7 +405,7 @@ const u8 *const gUnknown_085DD050[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07
}; };
const u8 *const gUnknown_085DD064[] = static const u8 *const gUnknown_085DD064[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36, BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36,
BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82, BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82,
@ -415,7 +414,7 @@ const u8 *const gUnknown_085DD064[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B
}; };
const u8 *const gUnknown_085DD078[] = static const u8 *const gUnknown_085DD078[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E, BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E,
BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA, BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA,
@ -424,7 +423,7 @@ const u8 *const gUnknown_085DD078[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98 BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98
}; };
const u8 *const gUnknown_085DD08C[] = static const u8 *const gUnknown_085DD08C[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3, BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3,
BattleFrontier_BattleTowerMultiBattleRoom_Text_245013, BattleFrontier_BattleTowerMultiBattleRoom_Text_245013,
@ -433,7 +432,7 @@ const u8 *const gUnknown_085DD08C[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0 BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0
}; };
const u8 *const gUnknown_085DD0A0[] = static const u8 *const gUnknown_085DD0A0[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6, BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6,
BattleFrontier_BattleTowerMultiBattleRoom_Text_245196, BattleFrontier_BattleTowerMultiBattleRoom_Text_245196,
@ -442,7 +441,7 @@ const u8 *const gUnknown_085DD0A0[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A
}; };
const u8 *const gUnknown_085DD0B4[] = static const u8 *const gUnknown_085DD0B4[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF, BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF,
BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4, BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4,
@ -451,7 +450,7 @@ const u8 *const gUnknown_085DD0B4[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3 BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3
}; };
const u8 *const gUnknown_085DD0C8[] = static const u8 *const gUnknown_085DD0C8[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6, BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6,
BattleFrontier_BattleTowerMultiBattleRoom_Text_245535, BattleFrontier_BattleTowerMultiBattleRoom_Text_245535,
@ -460,7 +459,7 @@ const u8 *const gUnknown_085DD0C8[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_245656 BattleFrontier_BattleTowerMultiBattleRoom_Text_245656
}; };
const u8 *const gUnknown_085DD0DC[] = static const u8 *const gUnknown_085DD0DC[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A, BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A,
BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5, BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5,
@ -469,7 +468,7 @@ const u8 *const gUnknown_085DD0DC[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F
}; };
const u8 *const gUnknown_085DD0F0[] = static const u8 *const gUnknown_085DD0F0[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_245851, BattleFrontier_BattleTowerMultiBattleRoom_Text_245851,
BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C, BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C,
@ -478,7 +477,7 @@ const u8 *const gUnknown_085DD0F0[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F
}; };
const u8 *const gUnknown_085DD104[] = static const u8 *const gUnknown_085DD104[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE, BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE,
BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7, BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7,
@ -487,7 +486,7 @@ const u8 *const gUnknown_085DD104[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E
}; };
const u8 *const gUnknown_085DD118[] = static const u8 *const gUnknown_085DD118[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79, BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79,
BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91, BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91,
@ -496,7 +495,7 @@ const u8 *const gUnknown_085DD118[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D
}; };
const u8 *const gUnknown_085DD12C[] = static const u8 *const gUnknown_085DD12C[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66, BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66,
BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F, BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F,
@ -505,7 +504,7 @@ const u8 *const gUnknown_085DD12C[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07
}; };
const u8 *const gUnknown_085DD140[] = static const u8 *const gUnknown_085DD140[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B, BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B,
BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60, BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60,
@ -514,7 +513,7 @@ const u8 *const gUnknown_085DD140[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0 BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0
}; };
const u8 *const gUnknown_085DD154[] = static const u8 *const gUnknown_085DD154[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20, BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20,
BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41, BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41,
@ -523,7 +522,7 @@ const u8 *const gUnknown_085DD154[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC
}; };
const u8 *const gUnknown_085DD168[] = static const u8 *const gUnknown_085DD168[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B, BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B,
BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58, BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58,
@ -532,7 +531,7 @@ const u8 *const gUnknown_085DD168[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_246002 BattleFrontier_BattleTowerMultiBattleRoom_Text_246002
}; };
const u8 *const gUnknown_085DD17C[] = static const u8 *const gUnknown_085DD17C[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_246020, BattleFrontier_BattleTowerMultiBattleRoom_Text_246020,
BattleFrontier_BattleTowerMultiBattleRoom_Text_246051, BattleFrontier_BattleTowerMultiBattleRoom_Text_246051,
@ -541,7 +540,7 @@ const u8 *const gUnknown_085DD17C[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D
}; };
const u8 *const gUnknown_085DD190[] = static const u8 *const gUnknown_085DD190[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A, BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A,
BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D, BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D,
@ -550,7 +549,7 @@ const u8 *const gUnknown_085DD190[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5 BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5
}; };
const u8 *const gUnknown_085DD1A4[] = static const u8 *const gUnknown_085DD1A4[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A, BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A,
BattleFrontier_BattleTowerMultiBattleRoom_Text_246244, BattleFrontier_BattleTowerMultiBattleRoom_Text_246244,
@ -559,7 +558,7 @@ const u8 *const gUnknown_085DD1A4[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4 BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4
}; };
const u8 *const gUnknown_085DD1B8[] = static const u8 *const gUnknown_085DD1B8[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F, BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F,
BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C, BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C,
@ -568,7 +567,7 @@ const u8 *const gUnknown_085DD1B8[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF
}; };
const u8 *const gUnknown_085DD1CC[] = static const u8 *const gUnknown_085DD1CC[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_246449, BattleFrontier_BattleTowerMultiBattleRoom_Text_246449,
BattleFrontier_BattleTowerMultiBattleRoom_Text_246478, BattleFrontier_BattleTowerMultiBattleRoom_Text_246478,
@ -577,7 +576,7 @@ const u8 *const gUnknown_085DD1CC[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_246529 BattleFrontier_BattleTowerMultiBattleRoom_Text_246529
}; };
const u8 *const gUnknown_085DD1E0[] = static const u8 *const gUnknown_085DD1E0[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_246571, BattleFrontier_BattleTowerMultiBattleRoom_Text_246571,
BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C, BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C,
@ -586,7 +585,7 @@ const u8 *const gUnknown_085DD1E0[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A
}; };
const u8 *const gUnknown_085DD1F4[] = static const u8 *const gUnknown_085DD1F4[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_246662, BattleFrontier_BattleTowerMultiBattleRoom_Text_246662,
BattleFrontier_BattleTowerMultiBattleRoom_Text_246686, BattleFrontier_BattleTowerMultiBattleRoom_Text_246686,
@ -595,7 +594,7 @@ const u8 *const gUnknown_085DD1F4[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A
}; };
const u8 *const gUnknown_085DD208[] = static const u8 *const gUnknown_085DD208[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_246741, BattleFrontier_BattleTowerMultiBattleRoom_Text_246741,
BattleFrontier_BattleTowerMultiBattleRoom_Text_246760, BattleFrontier_BattleTowerMultiBattleRoom_Text_246760,
@ -604,7 +603,7 @@ const u8 *const gUnknown_085DD208[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6
}; };
const u8 *const gUnknown_085DD21C[] = static const u8 *const gUnknown_085DD21C[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF, BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF,
BattleFrontier_BattleTowerMultiBattleRoom_Text_246831, BattleFrontier_BattleTowerMultiBattleRoom_Text_246831,
@ -613,7 +612,7 @@ const u8 *const gUnknown_085DD21C[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE
}; };
const u8 *const gUnknown_085DD230[] = static const u8 *const gUnknown_085DD230[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B, BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B,
BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B, BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B,
@ -622,7 +621,7 @@ const u8 *const gUnknown_085DD230[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1 BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1
}; };
const u8 *const gUnknown_085DD244[] = static const u8 *const gUnknown_085DD244[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22, BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22,
BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E, BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E,
@ -631,7 +630,7 @@ const u8 *const gUnknown_085DD244[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7 BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7
}; };
const u8 *const gUnknown_085DD258[] = static const u8 *const gUnknown_085DD258[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B, BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B,
BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F, BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F,
@ -640,7 +639,7 @@ const u8 *const gUnknown_085DD258[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9 BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9
}; };
const u8 *const gUnknown_085DD26C[] = static const u8 *const gUnknown_085DD26C[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22, BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22,
BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35, BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35,
@ -649,7 +648,7 @@ const u8 *const gUnknown_085DD26C[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9 BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9
}; };
const u8 *const gUnknown_085DD280[] = static const u8 *const gUnknown_085DD280[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D, BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D,
BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F, BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F,
@ -658,7 +657,7 @@ const u8 *const gUnknown_085DD280[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3 BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3
}; };
const u8 *const gUnknown_085DD294[] = static const u8 *const gUnknown_085DD294[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A, BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A,
BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39, BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39,
@ -667,7 +666,7 @@ const u8 *const gUnknown_085DD294[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE
}; };
const u8 *const gUnknown_085DD2A8[] = static const u8 *const gUnknown_085DD2A8[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21, BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21,
BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C, BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C,
@ -676,7 +675,7 @@ const u8 *const gUnknown_085DD2A8[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_247013 BattleFrontier_BattleTowerMultiBattleRoom_Text_247013
}; };
const u8 *const gUnknown_085DD2BC[] = static const u8 *const gUnknown_085DD2BC[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B, BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B,
BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D, BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D,
@ -685,7 +684,7 @@ const u8 *const gUnknown_085DD2BC[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A
}; };
const u8 *const gUnknown_085DD2D0[] = static const u8 *const gUnknown_085DD2D0[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C, BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C,
BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D, BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D,
@ -694,7 +693,7 @@ const u8 *const gUnknown_085DD2D0[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_247238 BattleFrontier_BattleTowerMultiBattleRoom_Text_247238
}; };
const u8 *const gUnknown_085DD2E4[] = static const u8 *const gUnknown_085DD2E4[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_247268, BattleFrontier_BattleTowerMultiBattleRoom_Text_247268,
BattleFrontier_BattleTowerMultiBattleRoom_Text_247291, BattleFrontier_BattleTowerMultiBattleRoom_Text_247291,
@ -703,7 +702,7 @@ const u8 *const gUnknown_085DD2E4[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_247348 BattleFrontier_BattleTowerMultiBattleRoom_Text_247348
}; };
const u8 *const gUnknown_085DD2F8[] = static const u8 *const gUnknown_085DD2F8[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A, BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A,
BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F, BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F,
@ -712,7 +711,7 @@ const u8 *const gUnknown_085DD2F8[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_247438 BattleFrontier_BattleTowerMultiBattleRoom_Text_247438
}; };
const u8 *const gUnknown_085DD30C[] = static const u8 *const gUnknown_085DD30C[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_247470, BattleFrontier_BattleTowerMultiBattleRoom_Text_247470,
BattleFrontier_BattleTowerMultiBattleRoom_Text_247484, BattleFrontier_BattleTowerMultiBattleRoom_Text_247484,
@ -721,7 +720,7 @@ const u8 *const gUnknown_085DD30C[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D
}; };
const u8 *const gUnknown_085DD320[] = static const u8 *const gUnknown_085DD320[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A, BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A,
BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C, BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C,
@ -730,7 +729,7 @@ const u8 *const gUnknown_085DD320[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5 BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5
}; };
const u8 *const gUnknown_085DD334[] = static const u8 *const gUnknown_085DD334[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D, BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D,
BattleFrontier_BattleTowerMultiBattleRoom_Text_247629, BattleFrontier_BattleTowerMultiBattleRoom_Text_247629,
@ -739,7 +738,7 @@ const u8 *const gUnknown_085DD334[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED
}; };
const u8 *const gUnknown_085DD348[] = static const u8 *const gUnknown_085DD348[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_247724, BattleFrontier_BattleTowerMultiBattleRoom_Text_247724,
BattleFrontier_BattleTowerMultiBattleRoom_Text_247749, BattleFrontier_BattleTowerMultiBattleRoom_Text_247749,
@ -748,7 +747,7 @@ const u8 *const gUnknown_085DD348[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_247807 BattleFrontier_BattleTowerMultiBattleRoom_Text_247807
}; };
const u8 *const gUnknown_085DD35C[] = static const u8 *const gUnknown_085DD35C[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_247838, BattleFrontier_BattleTowerMultiBattleRoom_Text_247838,
BattleFrontier_BattleTowerMultiBattleRoom_Text_247854, BattleFrontier_BattleTowerMultiBattleRoom_Text_247854,
@ -757,7 +756,7 @@ const u8 *const gUnknown_085DD35C[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D
}; };
const u8 *const gUnknown_085DD370[] = static const u8 *const gUnknown_085DD370[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_247942, BattleFrontier_BattleTowerMultiBattleRoom_Text_247942,
BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F, BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F,
@ -766,7 +765,7 @@ const u8 *const gUnknown_085DD370[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18
}; };
const u8 *const gUnknown_085DD384[] = static const u8 *const gUnknown_085DD384[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51, BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51,
BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76, BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76,
@ -775,7 +774,7 @@ const u8 *const gUnknown_085DD384[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16
}; };
const u8 *const gUnknown_085DD398[] = static const u8 *const gUnknown_085DD398[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E, BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E,
BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62, BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62,
@ -784,7 +783,7 @@ const u8 *const gUnknown_085DD398[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23
}; };
const u8 *const gUnknown_085DD3AC[] = static const u8 *const gUnknown_085DD3AC[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E, BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E,
BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C, BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C,
@ -793,7 +792,7 @@ const u8 *const gUnknown_085DD3AC[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E
}; };
const u8 *const gUnknown_085DD3C0[] = static const u8 *const gUnknown_085DD3C0[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97, BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97,
BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7, BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7,
@ -802,7 +801,7 @@ const u8 *const gUnknown_085DD3C0[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E
}; };
const u8 *const gUnknown_085DD3D4[] = static const u8 *const gUnknown_085DD3D4[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1, BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1,
BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5, BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5,
@ -811,7 +810,7 @@ const u8 *const gUnknown_085DD3D4[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D
}; };
const u8 *const gUnknown_085DD3E8[] = static const u8 *const gUnknown_085DD3E8[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3, BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3,
BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7, BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7,
@ -820,7 +819,7 @@ const u8 *const gUnknown_085DD3E8[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E
}; };
const u8 *const gUnknown_085DD3FC[] = static const u8 *const gUnknown_085DD3FC[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D, BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D,
BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB, BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB,
@ -829,7 +828,7 @@ const u8 *const gUnknown_085DD3FC[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_248151 BattleFrontier_BattleTowerMultiBattleRoom_Text_248151
}; };
const u8 *const gUnknown_085DD410[] = static const u8 *const gUnknown_085DD410[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E, BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E,
BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9, BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9,
@ -838,7 +837,7 @@ const u8 *const gUnknown_085DD410[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F
}; };
const u8 *const gUnknown_085DD424[] = static const u8 *const gUnknown_085DD424[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_248297, BattleFrontier_BattleTowerMultiBattleRoom_Text_248297,
BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1, BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1,
@ -847,7 +846,7 @@ const u8 *const gUnknown_085DD424[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D
}; };
const u8 *const gUnknown_085DD438[] = static const u8 *const gUnknown_085DD438[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_248369, BattleFrontier_BattleTowerMultiBattleRoom_Text_248369,
BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D, BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D,
@ -856,7 +855,7 @@ const u8 *const gUnknown_085DD438[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_248431 BattleFrontier_BattleTowerMultiBattleRoom_Text_248431
}; };
const u8 *const gUnknown_085DD44C[] = static const u8 *const gUnknown_085DD44C[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_248467, BattleFrontier_BattleTowerMultiBattleRoom_Text_248467,
BattleFrontier_BattleTowerMultiBattleRoom_Text_248477, BattleFrontier_BattleTowerMultiBattleRoom_Text_248477,
@ -865,7 +864,7 @@ const u8 *const gUnknown_085DD44C[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_248517 BattleFrontier_BattleTowerMultiBattleRoom_Text_248517
}; };
const u8 *const gUnknown_085DD460[] = static const u8 *const gUnknown_085DD460[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_248553, BattleFrontier_BattleTowerMultiBattleRoom_Text_248553,
BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A, BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A,
@ -874,7 +873,7 @@ const u8 *const gUnknown_085DD460[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_248614 BattleFrontier_BattleTowerMultiBattleRoom_Text_248614
}; };
const u8 *const gUnknown_085DD474[] = static const u8 *const gUnknown_085DD474[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E, BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E,
BattleFrontier_BattleTowerMultiBattleRoom_Text_248661, BattleFrontier_BattleTowerMultiBattleRoom_Text_248661,
@ -883,7 +882,7 @@ const u8 *const gUnknown_085DD474[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF
}; };
const u8 *const gUnknown_085DD488[] = static const u8 *const gUnknown_085DD488[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_248725, BattleFrontier_BattleTowerMultiBattleRoom_Text_248725,
BattleFrontier_BattleTowerMultiBattleRoom_Text_248751, BattleFrontier_BattleTowerMultiBattleRoom_Text_248751,
@ -892,7 +891,7 @@ const u8 *const gUnknown_085DD488[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7 BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7
}; };
const u8 *const gUnknown_085DD49C[] = static const u8 *const gUnknown_085DD49C[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_248829, BattleFrontier_BattleTowerMultiBattleRoom_Text_248829,
BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B, BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B,
@ -901,7 +900,7 @@ const u8 *const gUnknown_085DD49C[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_248908 BattleFrontier_BattleTowerMultiBattleRoom_Text_248908
}; };
const u8 *const gUnknown_085DD4B0[] = static const u8 *const gUnknown_085DD4B0[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B, BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B,
BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F, BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F,
@ -910,7 +909,7 @@ const u8 *const gUnknown_085DD4B0[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7 BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7
}; };
const u8 *const gUnknown_085DD4C4[] = static const u8 *const gUnknown_085DD4C4[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10, BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10,
BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40, BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40,
@ -919,7 +918,7 @@ const u8 *const gUnknown_085DD4C4[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB
}; };
const u8 *const gUnknown_085DD4D8[] = static const u8 *const gUnknown_085DD4D8[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22, BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22,
BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39, BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39,
@ -928,7 +927,7 @@ const u8 *const gUnknown_085DD4D8[] =
BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE
}; };
const u8 *const gUnknown_085DD4EC[] = static const u8 *const gUnknown_085DD4EC[] =
{ {
BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E, BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E,
BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B, BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B,
@ -941,7 +940,7 @@ struct
{ {
u32 facilityClass; u32 facilityClass;
const u8 *const *strings; const u8 *const *strings;
} const gUnknown_085DD500[50] = } const gUnknown_085DD500[] =
{ {
{0x00000047, gUnknown_085DD118}, {0x00000047, gUnknown_085DD118},
{0x0000002b, gUnknown_085DD12C}, {0x0000002b, gUnknown_085DD12C},
@ -995,7 +994,7 @@ struct
{0x00000007, gUnknown_085DD4EC} {0x00000007, gUnknown_085DD4EC}
}; };
const u8 *const *const gUnknown_085DD690[] = static const u8 *const *const gUnknown_085DD690[] =
{ {
gUnknown_085DCFD8, gUnknown_085DCFD8,
gUnknown_085DCFEC, gUnknown_085DCFEC,
@ -3298,12 +3297,13 @@ bool32 RubyBattleTowerRecordToEmerald(struct RSBattleTowerRecord *src, struct Em
{ {
dst->lvlMode = src->lvlMode; dst->lvlMode = src->lvlMode;
dst->winStreak = src->winStreak; dst->winStreak = src->winStreak;
for (i = 0; i < (signed) ARRAY_COUNT(sRubyFacilityClassToEmerald); i++) // BUG: Reading outside the array. sRubyFacilityClassToEmerald has less than FACILITY_CLASSES_COUNT entries.
for (i = 0; i < FACILITY_CLASSES_COUNT; i++)
{ {
if (sRubyFacilityClassToEmerald[i][0] == src->facilityClass) if (sRubyFacilityClassToEmerald[i][0] == src->facilityClass)
break; break;
} }
if (i != ARRAY_COUNT(sRubyFacilityClassToEmerald)) if (i != FACILITY_CLASSES_COUNT)
dst->facilityClass = sRubyFacilityClassToEmerald[i][1]; dst->facilityClass = sRubyFacilityClassToEmerald[i][1];
else else
dst->facilityClass = FACILITY_CLASS_YOUNGSTER; dst->facilityClass = FACILITY_CLASS_YOUNGSTER;
@ -3346,12 +3346,13 @@ bool32 EmeraldBattleTowerRecordToRuby(struct EmeraldBattleTowerRecord *src, stru
{ {
dst->lvlMode = src->lvlMode; dst->lvlMode = src->lvlMode;
dst->winStreak = src->winStreak; dst->winStreak = src->winStreak;
for (i = 0; i < (signed) ARRAY_COUNT(sRubyFacilityClassToEmerald); i++) // BUG: Reading outside the array. sRubyFacilityClassToEmerald has less than FACILITY_CLASSES_COUNT entries.
for (i = 0; i < FACILITY_CLASSES_COUNT; i++)
{ {
if (sRubyFacilityClassToEmerald[i][1] == src->facilityClass) if (sRubyFacilityClassToEmerald[i][1] == src->facilityClass)
break; break;
} }
if (i != ARRAY_COUNT(sRubyFacilityClassToEmerald)) if (i != FACILITY_CLASSES_COUNT)
dst->facilityClass = sRubyFacilityClassToEmerald[i][0]; dst->facilityClass = sRubyFacilityClassToEmerald[i][0];
else else
dst->facilityClass = 0x24; // FACILITY_CLASS_YOUNGSTER in Ruby/Sapphire. dst->facilityClass = 0x24; // FACILITY_CLASS_YOUNGSTER in Ruby/Sapphire.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -48,8 +48,6 @@ struct FrontierBrainMon
u16 moves[4]; u16 moves[4];
}; };
extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];
extern void sub_81B8558(void); extern void sub_81B8558(void);
// This file's functions. // This file's functions.

View File

@ -2,10 +2,11 @@
#include "bike.h" #include "bike.h"
#include "event_data.h" #include "event_data.h"
#include "event_object_movement.h" #include "event_object_movement.h"
#include "constants/maps.h" #include "fieldmap.h"
#include "constants/songs.h"
#include "sound.h" #include "sound.h"
#include "sprite.h" #include "sprite.h"
#include "constants/maps.h"
#include "constants/songs.h"
#define ROTATING_GATE_TILE_TAG 0x1300 #define ROTATING_GATE_TILE_TAG 0x1300
#define ROTATING_GATE_PUZZLE_MAX 12 #define ROTATING_GATE_PUZZLE_MAX 12
@ -638,9 +639,7 @@ static s32 GetCurrentMapRotatingGatePuzzleType(void)
static void RotatingGate_ResetAllGateOrientations(void) static void RotatingGate_ResetAllGateOrientations(void)
{ {
s32 i; s32 i;
u8 *ptr; u8 *ptr = (u8 *)GetVarPointer(VAR_TEMP_0);
ptr = (u8 *)GetVarPointer(VAR_TEMP_0);
for (i = 0; i < gRotatingGate_PuzzleCount; i++) for (i = 0; i < gRotatingGate_PuzzleCount; i++)
{ {
@ -715,12 +714,10 @@ static void RotatingGate_CreateGatesWithinViewport(s16 deltaX, s16 deltaY)
s16 y = gSaveBlock1Ptr->pos.y - 2; s16 y = gSaveBlock1Ptr->pos.y - 2;
s16 y2 = gSaveBlock1Ptr->pos.y + 0xe; s16 y2 = gSaveBlock1Ptr->pos.y + 0xe;
s16 x3, y3;
for (i = 0; i < gRotatingGate_PuzzleCount; i++) for (i = 0; i < gRotatingGate_PuzzleCount; i++)
{ {
x3 = gRotatingGate_PuzzleConfig[i].x + 7; s16 x3 = gRotatingGate_PuzzleConfig[i].x + 7;
y3 = gRotatingGate_PuzzleConfig[i].y + 7; s16 y3 = gRotatingGate_PuzzleConfig[i].y + 7;
if (y <= y3 && y2 >= y3 && x <= x3 && x2 >= x3 && if (y <= y3 && y2 >= y3 && x <= x3 && x2 >= x3 &&
gRotatingGate_GateSpriteIds[i] == MAX_SPRITES) gRotatingGate_GateSpriteIds[i] == MAX_SPRITES)
@ -734,11 +731,10 @@ static u8 RotatingGate_CreateGate(u8 gateId, s16 deltaX, s16 deltaY)
{ {
struct Sprite *sprite; struct Sprite *sprite;
struct SpriteTemplate template; struct SpriteTemplate template;
const struct RotatingGatePuzzle *gate;
u8 spriteId; u8 spriteId;
s16 x, y; s16 x, y;
gate = &gRotatingGate_PuzzleConfig[gateId]; const struct RotatingGatePuzzle *gate = &gRotatingGate_PuzzleConfig[gateId];
if (gate->shape == GATE_SHAPE_L1 || gate->shape == GATE_SHAPE_T1) if (gate->shape == GATE_SHAPE_L1 || gate->shape == GATE_SHAPE_T1)
template = sSpriteTemplate_RotatingGateRegular; template = sSpriteTemplate_RotatingGateRegular;
@ -767,12 +763,9 @@ static u8 RotatingGate_CreateGate(u8 gateId, s16 deltaX, s16 deltaY)
static void SpriteCallback_RotatingGate(struct Sprite *sprite) static void SpriteCallback_RotatingGate(struct Sprite *sprite)
{ {
u8 rotationDirection;
u8 orientation;
u8 affineAnimation; u8 affineAnimation;
u8 rotationDirection = sprite->data[1];
rotationDirection = sprite->data[1]; u8 orientation = sprite->data[2];
orientation = sprite->data[2];
RotatingGate_HideGatesOutsideViewport(sprite); RotatingGate_HideGatesOutsideViewport(sprite);
@ -802,10 +795,8 @@ static void SpriteCallback_RotatingGate(struct Sprite *sprite)
static void RotatingGate_HideGatesOutsideViewport(struct Sprite *sprite) static void RotatingGate_HideGatesOutsideViewport(struct Sprite *sprite)
{ {
u16 x; u16 x, y;
s16 x2; s16 x2, y2;
u16 y;
s16 y2;
sprite->invisible = FALSE; sprite->invisible = FALSE;
x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX; x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX;
@ -830,35 +821,27 @@ static void LoadRotatingGatePics(void)
LoadSpriteSheets(sRotatingGatesGraphicsTable); LoadSpriteSheets(sRotatingGatesGraphicsTable);
} }
/* static void RotatingGate_DestroyGatesOutsideViewport(void)
static*/ void RotatingGate_DestroyGatesOutsideViewport(void)
{ {
s16 x;
s16 x2;
s16 y;
s16 y2;
s16 xGate;
s16 yGate;
s32 i; s32 i;
struct Sprite *sprite;
// Same as RotatingGate_CreateGatesWithinViewport // Same as RotatingGate_CreateGatesWithinViewport
x = gSaveBlock1Ptr->pos.x - 2; s16 x = gSaveBlock1Ptr->pos.x - 2;
x2 = gSaveBlock1Ptr->pos.x + 0x11; s16 x2 = gSaveBlock1Ptr->pos.x + 0x11;
y = gSaveBlock1Ptr->pos.y - 2; s16 y = gSaveBlock1Ptr->pos.y - 2;
y2 = gSaveBlock1Ptr->pos.y + 0xe; s16 y2 = gSaveBlock1Ptr->pos.y + 0xe;
for (i = 0; i < gRotatingGate_PuzzleCount; i++) for (i = 0; i < gRotatingGate_PuzzleCount; i++)
{ {
xGate = gRotatingGate_PuzzleConfig[i].x + 7; s16 xGate = gRotatingGate_PuzzleConfig[i].x + 7;
yGate = gRotatingGate_PuzzleConfig[i].y + 7; s16 yGate = gRotatingGate_PuzzleConfig[i].y + 7;
if (gRotatingGate_GateSpriteIds[i] == MAX_SPRITES) if (gRotatingGate_GateSpriteIds[i] == MAX_SPRITES)
continue; continue;
if (xGate < x || xGate > x2 || yGate < y || yGate > y2) if (xGate < x || xGate > x2 || yGate < y || yGate > y2)
{ {
sprite = &gSprites[gRotatingGate_GateSpriteIds[i]]; struct Sprite *sprite = &gSprites[gRotatingGate_GateSpriteIds[i]];
FreeSpriteOamMatrix(sprite); FreeSpriteOamMatrix(sprite);
DestroySprite(sprite); DestroySprite(sprite);
gRotatingGate_GateSpriteIds[i] = MAX_SPRITES; gRotatingGate_GateSpriteIds[i] = MAX_SPRITES;
@ -866,23 +849,13 @@ static*/ void RotatingGate_DestroyGatesOutsideViewport(void)
} }
} }
static s32 RotatingGate_CanRotate(u8 gateId, s32 rotationDirection)
#ifdef NONMATCHING
bool8 MapGridIsImpassableAt(s32, s32); //fool the compiler
static s32 RotatingGate_CanRotate(u8 gateId, s16 rotationDirection)
{ {
const struct Coords8 *armPos; const struct Coords8 *armPos;
u8 orientation; u8 orientation;
s16 x; s16 x, y;
s16 y;
u8 shape; u8 shape;
u32 shape8; s32 i, j;
s32 i;
s32 j;
s32 armOrientation;
const u8 *gateArmCollisionData;
u8 armIndex;
if (rotationDirection == ROTATE_ANTICLOCKWISE) if (rotationDirection == ROTATE_ANTICLOCKWISE)
armPos = sRotatingGate_ArmPositionsAntiClockwiseRotation; armPos = sRotatingGate_ArmPositionsAntiClockwiseRotation;
@ -897,166 +870,40 @@ static s32 RotatingGate_CanRotate(u8 gateId, s16 rotationDirection)
x = gRotatingGate_PuzzleConfig[gateId].x + 7; x = gRotatingGate_PuzzleConfig[gateId].x + 7;
y = gRotatingGate_PuzzleConfig[gateId].y + 7; y = gRotatingGate_PuzzleConfig[gateId].y + 7;
// Loop through the gate's "arms" clockwise (north, south, east, west) // Loop through the gate's "arms" clockwise (north, south, east, west)
for (i = GATE_ARM_NORTH, shape8 = shape* 4*2 ; i <= GATE_ARM_WEST; i++) for (i = GATE_ARM_NORTH ; i <= GATE_ARM_WEST; i++)
{ {
// Ensure that no part of the arm collides with the map // Ensure that no part of the arm collides with the map
for (j = 0, armOrientation = orientation + i, gateArmCollisionData = (u8 *)((u32)sRotatingGate_ArmLayout + shape8 + 2*i); j < GATE_ARM_MAX_LENGTH; j++) for (j = 0; j < GATE_ARM_MAX_LENGTH; j++)
{ {
armIndex = 2 * (armOrientation % 4) + j; u8 armIndex = 2 * ((orientation + i) % 4) + j;
if (*gateArmCollisionData) if (sRotatingGate_ArmLayout[shape][2 * i + j])
{ {
if (MapGridIsImpassableAt(x + armPos[armIndex].deltaX, y + armPos[armIndex].deltaY) == TRUE) if (MapGridIsImpassableAt(x + armPos[armIndex].x, y + armPos[armIndex].y) == TRUE)
return FALSE; return FALSE;
} }
gateArmCollisionData++;
} }
} }
return TRUE; return TRUE;
} }
#else
NAKED
static s32 RotatingGate_CanRotate(u8 a, s16 rotationDirection)
{
asm(".syntax unified\n\
push {r4-r7,lr}\n\
mov r7, r10\n\
mov r6, r9\n\
mov r5, r8\n\
push {r5-r7}\n\
sub sp, 0xC\n\
lsls r0, 24\n\
lsrs r4, r0, 24\n\
cmp r1, 0x1\n\
bne _080FBCFC\n\
ldr r0, =sRotatingGate_ArmPositionsAntiClockwiseRotation\n\
mov r10, r0\n\
b _080FBD08\n\
.pool\n\
_080FBCFC:\n\
cmp r1, 0x2\n\
beq _080FBD04\n\
_080FBD00:\n\
movs r0, 0\n\
b _080FBD98\n\
_080FBD04:\n\
ldr r1, =sRotatingGate_ArmPositionsClockwiseRotation\n\
mov r10, r1\n\
_080FBD08:\n\
adds r0, r4, 0\n\
bl RotatingGate_GetGateOrientation\n\
lsls r0, 24\n\
lsrs r0, 24\n\
str r0, [sp]\n\
ldr r0, =gRotatingGate_PuzzleConfig\n\
ldr r1, [r0]\n\
lsls r0, r4, 3\n\
adds r0, r1\n\
ldrb r2, [r0, 0x4]\n\
ldrh r1, [r0]\n\
adds r1, 0x7\n\
ldrh r0, [r0, 0x2]\n\
adds r0, 0x7\n\
movs r3, 0\n\
lsls r2, 3\n\
str r2, [sp, 0x4]\n\
lsls r1, 16\n\
asrs r1, 16\n\
mov r9, r1\n\
lsls r0, 16\n\
asrs r0, 16\n\
mov r8, r0\n\
_080FBD38:\n\
movs r6, 0\n\
ldr r2, [sp]\n\
adds r7, r2, r3\n\
lsls r0, r3, 1\n\
adds r5, r7, 0\n\
ldr r1, [sp, 0x4]\n\
adds r0, r1\n\
ldr r2, =sRotatingGate_ArmLayout\n\
adds r4, r0, r2\n\
_080FBD4A:\n\
adds r0, r5, 0\n\
cmp r5, 0\n\
bge _080FBD52\n\
adds r0, r7, 0x3\n\
_080FBD52:\n\
asrs r0, 2\n\
lsls r0, 2\n\
subs r0, r5, r0\n\
lsls r0, 1\n\
adds r0, r6\n\
lsls r0, 24\n\
lsrs r1, r0, 24\n\
ldrb r0, [r4]\n\
cmp r0, 0\n\
beq _080FBD88\n\
lsls r1, 2\n\
add r1, r10\n\
movs r0, 0\n\
ldrsb r0, [r1, r0]\n\
add r0, r9\n\
ldrb r1, [r1, 0x1]\n\
lsls r1, 24\n\
asrs r1, 24\n\
add r1, r8\n\
str r3, [sp, 0x8]\n\
bl MapGridIsImpassableAt\n\
lsls r0, 24\n\
lsrs r0, 24\n\
ldr r3, [sp, 0x8]\n\
cmp r0, 0x1\n\
beq _080FBD00\n\
_080FBD88:\n\
adds r4, 0x1\n\
adds r6, 0x1\n\
cmp r6, 0x1\n\
ble _080FBD4A\n\
adds r3, 0x1\n\
cmp r3, 0x3\n\
ble _080FBD38\n\
movs r0, 0x1\n\
_080FBD98:\n\
add sp, 0xC\n\
pop {r3-r5}\n\
mov r8, r3\n\
mov r9, r4\n\
mov r10, r5\n\
pop {r4-r7}\n\
pop {r1}\n\
bx r1\n\
.pool\n\
.syntax divided\n");
}
#endif
static s32 RotatingGate_HasArm(u8 gateId, u8 armInfo) static s32 RotatingGate_HasArm(u8 gateId, u8 armInfo)
{ {
s32 isLongArm; s32 arm = armInfo / 2;
s8 armOrientation; s32 isLongArm = armInfo % 2;
s32 arm;
s32 shape;
arm = armInfo >> 1; s8 armOrientation = (arm - RotatingGate_GetGateOrientation(gateId) + 4) % 4;
isLongArm = armInfo & 1; s32 shape = gRotatingGate_PuzzleConfig[gateId].shape;
armOrientation = (arm - RotatingGate_GetGateOrientation(gateId) + 4) % 4;
shape = gRotatingGate_PuzzleConfig[gateId].shape;
return sRotatingGate_ArmLayout[shape][armOrientation * 2 + isLongArm]; return sRotatingGate_ArmLayout[shape][armOrientation * 2 + isLongArm];
} }
static void RotatingGate_TriggerRotationAnimation(u8 gateId, s32 rotationDirection) static void RotatingGate_TriggerRotationAnimation(u8 gateId, s32 rotationDirection)
{ {
struct Sprite *sprite;
if (gRotatingGate_GateSpriteIds[gateId] != MAX_SPRITES) if (gRotatingGate_GateSpriteIds[gateId] != MAX_SPRITES)
{ {
sprite = &gSprites[gRotatingGate_GateSpriteIds[gateId]]; struct Sprite *sprite = &gSprites[gRotatingGate_GateSpriteIds[gateId]];
sprite->data[1] = rotationDirection; sprite->data[1] = rotationDirection;
sprite->data[2] = RotatingGate_GetGateOrientation(gateId); sprite->data[2] = RotatingGate_GetGateOrientation(gateId);
} }
@ -1064,7 +911,7 @@ static void RotatingGate_TriggerRotationAnimation(u8 gateId, s32 rotationDirecti
static u8 RotatingGate_GetRotationInfo(u8 direction, s16 x, s16 y) static u8 RotatingGate_GetRotationInfo(u8 direction, s16 x, s16 y)
{ {
register const u8 *ptr; const u8 *ptr;
if (direction == DIR_NORTH) if (direction == DIR_NORTH)
ptr = sRotatingGate_RotationInfoNorth; ptr = sRotatingGate_RotationInfoNorth;