dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #147 from PikalaxALT/battle_tower

Browse Source 
Battle tower
This commit is contained in:
PikalaxALT
2019-11-09 16:08:36 -05:00
committed by GitHub
parent 4eb386f7c4 aba284d3be
commit 895a09a263
15 changed files with 1725 additions and 3722 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_message.s
+2 -2
View File
@@ -1686,7 +1686,7 @@ _080D8038:
ands r0, r1
cmp r0, 0
beq _080D8058
bl sub_80E60E4
bl GetBattleTowerTrainerClassNameId
lsls r0, 24
lsrs r0, 24
movs r1, 0xD
@@ -1781,7 +1781,7 @@ _080D80F0:
cmp r0, 0
beq _080D810C
mov r0, sp
bl sub_80E6150
bl GetBattleTowerTrainerName
b _080D8382
.align 2, 0
_080D8108: .4byte gBattleTypeFlags
asm/battle_tower.s
-3664
View File
File diff suppressed because it is too large Load Diff
asm/link_rfu_3.s
+4 -4
View File
@@ -12663,7 +12663,7 @@ sub_811C04C: @ 811C04C
ldr r6, _0811C0CC @ =gPlayerParty
ldr r5, _0811C0D0 @ =gEnemyParty
_0811C05C:
ldr r0, _0811C0D4 @ =gUnknown_203B0D4
ldr r0, _0811C0D4 @ =gSelectedOrderFromParty
adds r0, r4, r0
ldrb r0, [r0]
subs r0, 0x1
@@ -12717,7 +12717,7 @@ _0811C096:
.align 2, 0
_0811C0CC: .4byte gPlayerParty
_0811C0D0: .4byte gEnemyParty
_0811C0D4: .4byte gUnknown_203B0D4
_0811C0D4: .4byte gSelectedOrderFromParty
_0811C0D8: .4byte gTrainerBattleOpponent_A
_0811C0DC: .4byte CB2_InitBattle
thumb_func_end sub_811C04C
@@ -13029,7 +13029,7 @@ _0811C3BC:
movs r1, 0
movs r2, 0x20
bl memset
ldr r0, _0811C3DC @ =gUnknown_203B0D4
ldr r0, _0811C3DC @ =gSelectedOrderFromParty
ldrb r1, [r0]
ldrb r0, [r0, 0x1]
cmn r1, r0
@@ -13038,7 +13038,7 @@ _0811C3BC:
b _0811C3E2
.align 2, 0
_0811C3D8: .4byte gBlockSendBuffer
_0811C3DC: .4byte gUnknown_203B0D4
_0811C3DC: .4byte gSelectedOrderFromParty
_0811C3E0:
movs r0, 0x51
_0811C3E2:
asm/party_menu.s
+21 -21
View File
@@ -1152,7 +1152,7 @@ sub_811F388: @ 811F388
muls r0, r4
ldr r1, _0811F3AC @ =gPlayerParty
adds r0, r1
ldr r5, _0811F3B0 @ =gUnknown_203B0D4
ldr r5, _0811F3B0 @ =gSelectedOrderFromParty
bl sub_8127550
lsls r0, 24
cmp r0, 0
@@ -1163,7 +1163,7 @@ sub_811F388: @ 811F388
b _0811F3F8
.align 2, 0
_0811F3AC: .4byte gPlayerParty
_0811F3B0: .4byte gUnknown_203B0D4
_0811F3B0: .4byte gSelectedOrderFromParty
_0811F3B4:
adds r1, 0x2
lsls r1, 24
@@ -11131,7 +11131,7 @@ _0812418C:
adds r0, r1
mov r10, r0
_081241B6:
ldr r0, _0812420C @ =gUnknown_203B0D4
ldr r0, _0812420C @ =gSelectedOrderFromParty
adds r4, r5, r0
ldrb r0, [r4]
cmp r0, 0
@@ -11168,7 +11168,7 @@ _081241FC: .4byte gUnknown_8416B16
_08124200: .4byte gUnknown_203B09C
_08124204: .4byte gUnknown_203B0A0
_08124208: .4byte gTasks
_0812420C: .4byte gUnknown_203B0D4
_0812420C: .4byte gSelectedOrderFromParty
_08124210: .4byte gUnknown_203B0B4
_08124214: .4byte sub_811FB28
_08124218:
@@ -11237,7 +11237,7 @@ sub_8124278: @ 8124278
adds r0, 0xD
bl sub_8121CE4
movs r4, 0
ldr r3, _081242C0 @ =gUnknown_203B0D4
ldr r3, _081242C0 @ =gSelectedOrderFromParty
ldr r6, _081242C4 @ =gUnknown_203B0A0
adds r5, r6, 0
_0812429E:
@@ -11257,7 +11257,7 @@ _0812429E:
b _081242E6
.align 2, 0
_081242BC: .4byte gUnknown_203B09C
_081242C0: .4byte gUnknown_203B0D4
_081242C0: .4byte gSelectedOrderFromParty
_081242C4: .4byte gUnknown_203B0A0
_081242C8:
ldrb r0, [r3, 0x1]
@@ -11287,7 +11287,7 @@ _081242E6:
movs r0, 0x1
movs r2, 0x1
bl sub_8121C70
ldr r4, _08124348 @ =gUnknown_203B0D4
ldr r4, _08124348 @ =gSelectedOrderFromParty
ldrb r0, [r4]
cmp r0, 0
beq _08124312
@@ -11324,7 +11324,7 @@ _08124328:
bx r0
.align 2, 0
_08124344: .4byte gUnknown_203B0B4
_08124348: .4byte gUnknown_203B0D4
_08124348: .4byte gSelectedOrderFromParty
_0812434C: .4byte gTasks
_08124350: .4byte sub_811FB28
thumb_func_end sub_8124278
@@ -17411,14 +17411,14 @@ _081274F8: .4byte sub_812773C
thumb_func_start sub_81274FC
sub_81274FC: @ 81274FC
push {lr}
ldr r0, _0812750C @ =gUnknown_203B0D4
ldr r0, _0812750C @ =gSelectedOrderFromParty
movs r1, 0
movs r2, 0x3
bl memset
pop {r0}
bx r0
.align 2, 0
_0812750C: .4byte gUnknown_203B0D4
_0812750C: .4byte gSelectedOrderFromParty
thumb_func_end sub_81274FC
thumb_func_start sub_8127510
@@ -17564,18 +17564,18 @@ sub_81275F8: @ 81275F8
_08127618: .4byte gPlayerParty
_0812761C: .4byte gUnknown_203B0A0
_08127620:
ldr r1, _0812762C @ =gUnknown_203B0D4
ldr r1, _0812762C @ =gSelectedOrderFromParty
ldrb r0, [r1, 0x2]
cmp r0, 0
bne _08127630
movs r0, 0x11
b _08127702
.align 2, 0
_0812762C: .4byte gUnknown_203B0D4
_0812762C: .4byte gSelectedOrderFromParty
_08127630:
movs r5, 0
_08127632:
ldr r2, _081276DC @ =gUnknown_203B0D4
ldr r2, _081276DC @ =gSelectedOrderFromParty
adds r4, r2, r5
ldrb r0, [r4]
movs r1, 0x64
@@ -17618,7 +17618,7 @@ _0812767E:
adds r0, r2
movs r1, 0
ldrsh r4, [r0, r1]
ldr r2, _081276DC @ =gUnknown_203B0D4
ldr r2, _081276DC @ =gSelectedOrderFromParty
adds r6, r2, r5
ldrb r0, [r6]
muls r0, r7
@@ -17660,18 +17660,18 @@ _081276D0:
bls _08127632
b _08127700
.align 2, 0
_081276DC: .4byte gUnknown_203B0D4
_081276DC: .4byte gSelectedOrderFromParty
_081276E0: .4byte gUnknown_203B09C
_081276E4: .4byte 0x00000236
_081276E8:
ldr r2, _081276F4 @ =gUnknown_203B0D4
ldr r2, _081276F4 @ =gSelectedOrderFromParty
ldrb r0, [r2, 0x1]
cmp r0, 0
bne _08127700
movs r0, 0x12
b _08127702
.align 2, 0
_081276F4: .4byte gUnknown_203B0D4
_081276F4: .4byte gSelectedOrderFromParty
_081276F8:
movs r0, 0x13
b _08127702
@@ -17696,7 +17696,7 @@ sub_8127710: @ 8127710
lsls r0, 24
lsrs r2, r0, 24
movs r1, 0
ldr r3, _08127728 @ =gUnknown_203B0D4
ldr r3, _08127728 @ =gSelectedOrderFromParty
_0812771A:
adds r0, r1, r3
ldrb r0, [r0]
@@ -17705,7 +17705,7 @@ _0812771A:
movs r0, 0x1
b _08127738
.align 2, 0
_08127728: .4byte gUnknown_203B0D4
_08127728: .4byte gSelectedOrderFromParty
_0812772C:
adds r0, r1, 0x1
lsls r0, 24
@@ -17740,7 +17740,7 @@ sub_812773C: @ 812773C
.align 2, 0
_08127764: .4byte gTasks
_08127768:
ldr r0, _08127780 @ =gUnknown_203B0D4
ldr r0, _08127780 @ =gSelectedOrderFromParty
ldrb r0, [r0]
cmp r0, 0
beq _08127784
@@ -17750,7 +17750,7 @@ _08127768:
bl sub_811FA78
b _0812779E
.align 2, 0
_08127780: .4byte gUnknown_203B0D4
_08127780: .4byte gSelectedOrderFromParty
_08127784:
movs r0, 0x1A
bl PlaySE
asm/script_pokemon_util_80A0058.s
+6 -6
View File
@@ -396,7 +396,7 @@ _080A034C: .4byte sub_80A0350
thumb_func_start sub_80A0350
sub_80A0350: @ 80A0350
push {lr}
ldr r0, _080A0360 @ =gUnknown_203B0D4
ldr r0, _080A0360 @ =gSelectedOrderFromParty
ldrb r1, [r0]
cmp r1, 0
bne _080A0368
@@ -404,7 +404,7 @@ sub_80A0350: @ 80A0350
strh r1, [r0]
b _080A036E
.align 2, 0
_080A0360: .4byte gUnknown_203B0D4
_080A0360: .4byte gSelectedOrderFromParty
_080A0364: .4byte gSpecialVar_Result
_080A0368:
ldr r1, _080A0378 @ =gSpecialVar_Result
@@ -438,7 +438,7 @@ _080A0398: .4byte sub_80A039C
thumb_func_start sub_80A039C
sub_80A039C: @ 80A039C
push {r4,lr}
ldr r0, _080A03B0 @ =gUnknown_203B0D4
ldr r0, _080A03B0 @ =gSelectedOrderFromParty
ldrb r4, [r0]
cmp r4, 0
bne _080A03B8
@@ -447,7 +447,7 @@ sub_80A039C: @ 80A039C
strh r4, [r0]
b _080A03C2
.align 2, 0
_080A03B0: .4byte gUnknown_203B0D4
_080A03B0: .4byte gSelectedOrderFromParty
_080A03B4: .4byte gSpecialVar_Result
_080A03B8:
bl ReducePlayerPartyToThree
@@ -481,7 +481,7 @@ ReducePlayerPartyToThree: @ 80A03D8
ldr r6, _080A0454 @ =gPlayerParty
adds r4, r7, 0
_080A03F4:
ldr r0, _080A0458 @ =gUnknown_203B0D4
ldr r0, _080A0458 @ =gSelectedOrderFromParty
adds r1, r5, r0
ldrb r0, [r1]
cmp r0, 0
@@ -528,7 +528,7 @@ _080A042C:
bx r0
.align 2, 0
_080A0454: .4byte gPlayerParty
_080A0458: .4byte gUnknown_203B0D4
_080A0458: .4byte gSelectedOrderFromParty
_080A045C: .4byte 0x05000096
thumb_func_end ReducePlayerPartyToThree
data/specials.inc
+1 -1
View File
@@ -239,7 +239,7 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special Special_GetLeadMonFriendship
def_special sub_80E5970
def_special ScrSpecial_BattleTowerMapScript2
def_special ChooseNextBattleTowerTrainer
def_special CheckPartyBattleTowerBanlist
def_special PrintBattleTowerTrainerGreeting
include/battle.h
+1 -1
View File
@@ -432,7 +432,7 @@ struct BattleStruct
u16 changedItems[MAX_BATTLERS_COUNT];
u8 intimidateBattler;
u8 switchInItemsCounter;
u8 arenaTurnCounter; // not used in FR?
u8 field_DA; // battle tower related
u8 turnSideTracker;
u8 fillerDC[0xDF-0xDC];
u8 givenExpMons;
include/battle_tower.h
+2 -2
View File
@@ -12,7 +12,7 @@ struct BattleTowerTrainer
u8 trainerClass;
u8 name[3];
u8 teamFlags;
u16 speech[6];
u16 greeting[6];
};
struct BattleTowerPokemonTemplate
@@ -26,7 +26,7 @@ struct BattleTowerPokemonTemplate
};
u16 sub_8164FCC(u8, u8);
void sub_80E7524(struct BattleTowerEReaderTrainer *);
void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *);
void ValidateEReaderTrainer(void);
u8 GetBattleTowerTrainerFrontSpriteId(void);
u8 GetEreaderTrainerFrontSpriteId(void);
include/constants/battle_tower.h
+7
View File
@@ -72,4 +72,11 @@
#define BATTLE_TOWER_ITEM_LUCKY_PUNCH 61
#define BATTLE_TOWER_ITEM_GANLON_BERRY 62
#define BTSPECIAL_TEST 0
#define BTSPECIAL_RESULT_SAVE_SCUM 1
#define BTSPECIAL_RESULT_WON7 2
#define BTSPECIAL_RESULT_LOST 3
#define BTSPECIAL_RESULT_QUICKSAVE 4
#define BTSPECIAL_RESULT_INACTIVE 5
#endif //GUARD_CONSTANTS_BATTLE_TOWER_H
include/party_menu.h
+1
View File
@@ -45,6 +45,7 @@ extern u8 gUnknown_203B0C0;
extern u8 gUnknown_203B0C1;
extern u8 gUnknown_203B0DC[3];
extern void (*gUnknown_3005E98)(u8 taskId, TaskFunc func);
extern u8 gSelectedOrderFromParty[3];
bool8 FieldCallback_PrepareFadeInFromMenu(void);
bool8 MonKnowsMove(struct Pokemon *, u16);
include/script_pokemon_util_80A0058.h
+1
View File
@@ -5,5 +5,6 @@ bool8 ScriptGiveMon(u16 species, u8 level, u16 item, u32 unk1, u32 unk2, u8 unk3
bool8 ScriptGiveEgg(u16 species);
void ScriptSetMonMoveSlot(u8 partyIdx, u16 move, u8 slot);
void sp000_heal_pokemon(void);
void ReducePlayerPartyToThree(void);
#endif //GUARD_SCRIPT_POKEMON_UTIL_80A0058_H
ld_script.txt
-1
View File
@@ -209,7 +209,6 @@ SECTIONS {
asm/learn_move.o(.text);
src/fldeff_softboiled.o(.text);
src/battle_tower.o(.text);
asm/battle_tower.o(.text);
src/battle_controller_oak_old_man.o(.text);
src/player_pc.o(.text);
src/intro.o(.text);
src/battle_tower.c
+1664 -7
View File
File diff suppressed because it is too large Load Diff
src/mevent.c
+1 -1
View File
@@ -588,7 +588,7 @@ void DestroyWonderCard(void)
ClearRamScript();
sub_806E2D0();
sub_806E370();
sub_80E7524(&gSaveBlock2Ptr->battleTower.ereaderTrainer);
ClearEReaderTrainer(&gSaveBlock2Ptr->battleTower.ereaderTrainer);
}
bool32 sub_8143F68(const struct MEWonderCardData * data)
sym_ewram.txt
+14 -12
View File
@@ -75,6 +75,7 @@ gUnknown_2031DEA: @ 2031DEA
gUnknown_2031DEC: @ 2031DEC
.space 0x10
.align 2
.include "src/fieldmap.o"
gUnknown_2036E28: @ 2036E28
@@ -189,7 +190,9 @@ gAnimBattlerSpecies: @ 2037F1C
gUnknown_2037F24: @ 2037F24
.space 0x4
.align 2
.include "src/battle_anim_mons.o"
.align 2
.include "src/title_screen.o"
.align 2
@@ -219,6 +222,7 @@ gUnknown_20386A8: @ 20386A8
gFieldEffectArguments: @ 20386E0
.space 0x20
.align 2
.include "src/scanline_effect.o"
.align 2
@@ -352,10 +356,12 @@ gUnknown_2039984: @ 2039984
gUnknown_203998C: @ 203998C
.space 0x4
.align 2
.include "src/money.o"
.align 2
.include "src/safari_zone.o"
.align 2
.include "src/item_use.o"
.align 2
@@ -413,7 +419,6 @@ gPlayerFacingPosition: @ 2039A04
.align 2
.include "src/field_specials.o"
.align 2
.include "src/battle_records.o"
@@ -423,7 +428,9 @@ gUnknown_2039A20: @ 2039A20
gUnknown_2039A24: @ 2039A24
.space 0x4
.align 2
.include "src/coins.o"
.align 2
.include "src/battle_transition.o"
gUnknown_2039A30: @ 2039A30
@@ -432,7 +439,9 @@ gUnknown_2039A30: @ 2039A30
gUnknown_2039A34: @ 2039A34
.space 0x4
.align 2
.include "src/save.o"
.align 2
.include "src/mystery_event_script.o"
gUnknown_203AAB0: @ 203AAB0
@@ -441,14 +450,12 @@ gUnknown_203AAB0: @ 203AAB0
gUnknown_203AAB4: @ 203AAB4
.space 0x4
gUnknown_203AAB8: @ 203AAB8
.space 0x4
.align 2
.include "src/battle_tower.o"
.align 2
.include "src/player_pc.o"
.align 2
.include "src/intro.o"
.align 2
.include "src/hall_of_fame.o"
.align 2
@@ -496,6 +503,7 @@ gUnknown_203ACEC: @ 203ACEC
gUnknown_203ACF0: @ 203ACF0
.space 0x4
.align 2
.include "src/list_menu.o"
.align 2
gUnknown_203ACFC: @ 203ACFC
@@ -539,22 +547,16 @@ gSpecialVar_ItemId: @ 203AD30
.align 2
.include "src/bag.o"
.align 2
.include "src/trainer_pokemon_sprites.o"
.align 2
.include "src/vs_seeker.o"
.align 2
.include "src/item_pc.o"
.align 2
.include "src/mailbox_pc.o"
.align 2
.include "src/menu.o"
.align 2
.include "src/quest_log.o"
@@ -640,7 +642,7 @@ gUnknown_203B0CC: @ 203B0CC
gUnknown_203B0D0: @ 203B0D0
.space 0x4
gUnknown_203B0D4: @ 203B0D4
gSelectedOrderFromParty: @ 203B0D4
.space 0x4
gUnknown_203B0D8: @ 203B0D8