Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-20 11:58:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into slot_machine

Browse Source
This commit is contained in:
PikalaxALT 2019-07-30 19:40:00 -04:00
commit fba22dbd24
36 changed files with 3971 additions and 7632 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/battle_setup.s
View File

@ -30,13 +30,13 @@ _0807F644:
bne _0807F686
bl sub_812B478
ldrb r0, [r4, 0x2]
bl sub_80D08B8
bl BT_StartOnField
ldrh r0, [r4]
adds r0, 0x1
strh r0, [r4]
b _0807F686
_0807F65E:
bl sub_80D08F8
bl BT_IsDone
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1

6
asm/battle_tower.s
View File

@ -2025,7 +2025,7 @@ sub_80E68C4: @ 80E68C4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_80D08F8
bl BT_IsDone
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -2114,7 +2114,7 @@ _080E6970:
bl sub_8080060
lsls r0, 24
lsrs r0, 24
bl sub_80D08B8
bl BT_StartOnField
b _080E69E6
.align 2, 0
_080E698C: .4byte gSaveBlock1Ptr
@ -2154,7 +2154,7 @@ _080E69A0:
bl sub_8080060
lsls r0, 24
lsrs r0, 24
bl sub_80D08B8
bl BT_StartOnField
_080E69E6:
add sp, 0x4
pop {r4-r6}

7480
asm/battle_transition.s
View File

File diff suppressed because it is too large Load Diff

6
asm/overworld.s
View File

@ -3398,13 +3398,13 @@ sub_8056578: @ 8056578
bx r0
thumb_func_end sub_8056578
thumb_func_start sub_80565A8
sub_80565A8: @ 80565A8
thumb_func_start CB2_OverworldBasic
CB2_OverworldBasic: @ 80565A8
push {lr}
bl sub_8056578
pop {r0}
bx r0
thumb_func_end sub_80565A8
thumb_func_end CB2_OverworldBasic
thumb_func_start sub_80565B4
sub_80565B4: @ 80565B4

123
data/data_83F5738.s
View File

@ -133,128 +133,7 @@ gUnknown_83F846D:: @ 83F846D
gUnknown_83F847D:: @ 83F847D
.incbin "baserom.gba", 0x3F847D, 0x323
gUnknown_83F87A0:: @ 83F87A0
.incbin "baserom.gba", 0x3F87A0, 0x580
gUnknown_83F8D20:: @ 83F8D20
.incbin "baserom.gba", 0x3F8D20, 0x240
gUnknown_83F8F60:: @ 83F8F60
.incbin "baserom.gba", 0x3F8F60, 0x11E0
gUnknown_83FA140:: @ 83FA140
.incbin "baserom.gba", 0x3FA140, 0x1E0
gUnknown_83FA320:: @ 83FA320
.incbin "baserom.gba", 0x3FA320, 0x48
gUnknown_83FA368:: @ 83FA368
.incbin "baserom.gba", 0x3FA368, 0x48
gUnknown_83FA3B0:: @ 83FA3B0
.incbin "baserom.gba", 0x3FA3B0, 0x10
gUnknown_83FA3C0:: @ 83FA3C0
.incbin "baserom.gba", 0x3FA3C0, 0xC
gUnknown_83FA3CC:: @ 83FA3CC
.incbin "baserom.gba", 0x3FA3CC, 0x8
gUnknown_83FA3D4:: @ 83FA3D4
.incbin "baserom.gba", 0x3FA3D4, 0x8
gUnknown_83FA3DC:: @ 83FA3DC
.incbin "baserom.gba", 0x3FA3DC, 0x18
gUnknown_83FA3F4:: @ 83FA3F4
.incbin "baserom.gba", 0x3FA3F4, 0xC
gUnknown_83FA400:: @ 83FA400
.incbin "baserom.gba", 0x3FA400, 0x4
gUnknown_83FA404:: @ 83FA404
.incbin "baserom.gba", 0x3FA404, 0xA
gUnknown_83FA40E:: @ 83FA40E
.incbin "baserom.gba", 0x3FA40E, 0x6
gUnknown_83FA414:: @ 83FA414
.incbin "baserom.gba", 0x3FA414, 0x1C
gUnknown_83FA430:: @ 83FA430
.incbin "baserom.gba", 0x3FA430, 0x8
gUnknown_83FA438:: @ 83FA438
.incbin "baserom.gba", 0x3FA438, 0xC
gUnknown_83FA444:: @ 83FA444
.incbin "baserom.gba", 0x3FA444, 0x20
gUnknown_83FA464:: @ 83FA464
.incbin "baserom.gba", 0x3FA464, 0x8
gUnknown_83FA46C:: @ 83FA46C
.incbin "baserom.gba", 0x3FA46C, 0x28
gUnknown_83FA494:: @ 83FA494
.incbin "baserom.gba", 0x3FA494, 0x6
gUnknown_83FA49A:: @ 83FA49A
.incbin "baserom.gba", 0x3FA49A, 0x14
gUnknown_83FA4AE:: @ 83FA4AE
.incbin "baserom.gba", 0x3FA4AE, 0x16
gUnknown_83FA4C4:: @ 83FA4C4
.incbin "baserom.gba", 0x3FA4C4, 0x1C
gUnknown_83FA4E0:: @ 83FA4E0
.incbin "baserom.gba", 0x3FA4E0, 0x4
gUnknown_83FA4E4:: @ 83FA4E4
.incbin "baserom.gba", 0x3FA4E4, 0x4
gUnknown_83FA4E8:: @ 83FA4E8
.incbin "baserom.gba", 0x3FA4E8, 0xC
gUnknown_83FA4F4:: @ 83FA4F4
.incbin "baserom.gba", 0x3FA4F4, 0x14
gUnknown_83FA508:: @ 83FA508
.incbin "baserom.gba", 0x3FA508, 0xC
gUnknown_83FA514:: @ 83FA514
.incbin "baserom.gba", 0x3FA514, 0xC
gUnknown_83FA520:: @ 83FA520
.incbin "baserom.gba", 0x3FA520, 0x14
gUnknown_83FA534:: @ 83FA534
.incbin "baserom.gba", 0x3FA534, 0x46
gUnknown_83FA57A:: @ 83FA57A
.incbin "baserom.gba", 0x3FA57A, 0xE
gUnknown_83FA588:: @ 83FA588
.incbin "baserom.gba", 0x3FA588, 0x44
gUnknown_83FA5CC:: @ 83FA5CC
.incbin "baserom.gba", 0x3FA5CC, 0x6C
gUnknown_83FA638:: @ 83FA638
.incbin "baserom.gba", 0x3FA638, 0x108
gUnknown_83FA740:: @ 83FA740
.incbin "baserom.gba", 0x3FA740, 0x14
gUnknown_83FA754:: @ 83FA754
.incbin "baserom.gba", 0x3FA754, 0x30
gUnknown_83FA784:: @ 83FA784
.incbin "baserom.gba", 0x3FA784, 0x4B0
gUnknown_83FAC34:: @ 83FAC34
.incbin "baserom.gba", 0x3FAC34, 0x500
.section .rodata.83FB134
gUnknown_83FB134:: @ 83FB134
.incbin "baserom.gba", 0x3FB134, 0xA80

8
data/field_map_obj.s
View File

@ -31,7 +31,13 @@ gUnknown_83A0010:: @ 83A0010
.incbin "baserom.gba", 0x3A0010, 0x3688
gUnknown_83A3698:: @ 83A3698
.incbin "baserom.gba", 0x3A3698, 0x1AC0
.incbin "baserom.gba", 0x3A3698, 0x80
gEventObjectBaseOam_32x32:: @ 83A3718
.incbin "baserom.gba", 0x3A3718, 0x8
gUnknown_83A3720:: @ 83A3720
.incbin "baserom.gba", 0x3A3720, 0x1a38
gUnknown_83A5158:: @ 83A5158
.incbin "baserom.gba", 0x3A5158, 0xB0

19
graphics/battle_transitions/agatha_bg.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
172 49 49
115 115 115
148 148 148
180 180 180
213 213 213
255 82 172
255 98 189
255 115 205
255 131 222
255 148 238
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

BIN
graphics/battle_transitions/big_pokeball_tilemap.bin Normal file
View File

Binary file not shown.

BIN
graphics/battle_transitions/big_pokeball_tileset.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 553 B

19
graphics/battle_transitions/blue_bg.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
172 49 49
115 115 115
148 148 148
180 180 180
213 213 213
197 197 65
213 213 82
230 230 98
246 246 115
255 255 131
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

19
graphics/battle_transitions/bruno_bg.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
172 49 49
115 115 115
148 148 148
180 180 180
213 213 213
8 213 8
32 238 32
49 246 49
74 255 74
123 255 123
230 123 139
246 139 156
255 156 172
255 172 189
255 189 205
230 123 139

19
graphics/battle_transitions/green_bg.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
230 123 139
246 139 156
255 156 172
255 172 189
255 189 205
255 255 255
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

BIN
graphics/battle_transitions/grid_square_tileset.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 121 B

19
graphics/battle_transitions/lance_bg.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
172 49 49
115 115 115
148 148 148
180 180 180
213 213 213
0 0 131
16 16 148
32 32 164
49 49 180
65 65 197
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

19
graphics/battle_transitions/lorelei_bg.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
172 49 49
115 115 115
148 148 148
180 180 180
213 213 213
189 0 189
205 16 205
222 32 222
238 49 238
255 65 255
106 180 213
123 197 230
139 213 246
156 230 255
172 246 255
255 255 255

19
graphics/battle_transitions/red_bg.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
106 180 213
123 197 230
139 213 246
156 230 255
172 246 255
255 255 255
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

19
graphics/battle_transitions/sliding_pokeball.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 172 238
246 8 0
238 213 180
222 180 148
255 255 255
222 230 238
189 205 230
156 180 222
98 156 180
148 0 0
197 197 197
238 230 164
222 205 131
213 180 106
205 156 82
0 0 0

BIN
graphics/battle_transitions/sliding_pokeball.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 309 B

BIN
graphics/battle_transitions/sliding_pokeball_tilemap.bin Normal file
View File

Binary file not shown.

BIN
graphics/battle_transitions/unused_brendan.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 475 B

BIN
graphics/battle_transitions/unused_lass.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 412 B

19
graphics/battle_transitions/unused_trainer.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
255 222 205
222 164 148
205 131 115
123 90 82
57 74 123
41 57 98
24 41 82
16 32 57
222 230 238
255 197 90
189 156 90
255 98 90
197 65 65
255 255 255
0 0 0

BIN
graphics/battle_transitions/vsbar_tilemap.bin Normal file
View File

Binary file not shown.

BIN
graphics/battle_transitions/vsbar_tileset.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 158 B

37
include/battle_transition.h
View File

@ -3,8 +3,39 @@
#include "global.h"
void sub_8149DFC(u8 a0);
bool8 sub_80D08F8(void);
void sub_80D08B8(u8 a0);
enum
{
MUGSHOT_LORELEI,
MUGSHOT_BRUNO,
MUGSHOT_AGATHA,
MUGSHOT_LANCE,
MUGSHOT_BLUE,
MUGSHOTS_COUNT
};
#define B_TRANSITION_BLUR 0
#define B_TRANSITION_DISTORTED_WAVE 1
#define B_TRANSITION_HORIZONTAL_CORRUGATE 2
#define B_TRANSITION_BIG_POKEBALL 3
#define B_TRANSITION_SLIDING_POKEBALLS 4
#define B_TRANSITION_CLOCKWISE_BLACKFADE 5
#define B_TRANSITION_FULLSCREEN_WAVE 6
#define B_TRANSITION_BLACK_WAVE_TO_RIGHT 7
#define B_TRANSITION_SLICED_SCREEN 8
#define B_TRANSITION_WHITEFADE_IN_STRIPES 9
#define B_TRANSITION_GRID_SQUARES 10
#define B_TRANSITION_BLACK_DOODLES 11
#define B_TRANSITION_LORELEI 12
#define B_TRANSITION_BRUNO 13
#define B_TRANSITION_AGATHA 14
#define B_TRANSITION_LANCE 15
#define B_TRANSITION_BLUE 16
#define B_TRANSITION_ANTI_CLOCKWISE_SPIRAL 17
extern const struct SpritePalette sSpritePalette_SlidingPokeball;
bool8 BT_IsDone(void);
void BT_StartOnField(u8 transitionId);
bool8 FldEff_Pokeball(void);
#endif // GUARD_BATTLE_TRANSITION_H

1
include/field_camera.h
View File

@ -26,5 +26,6 @@ extern u16 gUnknown_03005DE8;
void DrawWholeMapView(void);
void CurrentMapDrawMetatileAt(int x, int y);
void sub_805A658(s16 *x, s16 *y);
#endif //GUARD_FIELD_CAMERA_H

2
include/field_effect.h
View File

@ -83,5 +83,7 @@ void sub_80B69DC(void);
void CreateTeleportFieldEffectTask(void);
void FieldEffectActiveListRemove(u8 id);
void sub_8085620(void);
void FieldEffectStop(struct Sprite *sprite, u8 id);
u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer);
#endif //GUARD_FIELD_EFFECTS_H

1
include/overworld.h
View File

@ -106,6 +106,7 @@ extern bool8 (* gFieldCallback2)(void);
void SetLastHealLocationWarp(u8 healLocaionId);
void sub_8055864(u8 mapGroup, u8 mapNum);
void CB2_Overworld(void);
void CB2_OverworldBasic(void);
void CB2_NewGame(void);
bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType);
void Overworld_ResetStateAfterTeleport(void);

7
include/trainer_pokemon_sprites.h
View File

@ -1,5 +1,5 @@
#ifndef GUARD_BATTLE_DOME_CARDS_H
#define GUARD_BATTLE_DOME_CARDS_H
#ifndef GUARD_TRAINER_POKEMON_SPRITES_H
#define GUARD_TRAINER_POKEMON_SPRITES_H
#include "global.h"
@ -13,5 +13,6 @@ u16 sub_818D938(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteS
u8 sub_818D97C(u8 a0, u8 a1);
u16 CreateTrainerPicSprite(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
u16 FreeAndDestroyTrainerPicSprite(u16);
u16 PlayerGenderToFrontTrainerPicId_Debug(u8 gender, bool8 getClass);
#endif //GUARD_BATTLE_DOME_CARDS_H
#endif // GUARD_TRAINER_POKEMON_SPRITES_H

4
ld_script.txt
View File

@ -191,7 +191,7 @@ SECTIONS {
asm/evolution_scene.o(.text);
src/coins.o(.text);
src/fldeff_strength.o(.text);
asm/battle_transition.o(.text);
src/battle_transition.o(.text);
asm/battle_controller_link_partner.o(.text);
asm/battle_message.o(.text);
src/math_util.o(.text);
@ -418,6 +418,8 @@ SECTIONS {
data/data_83F5738.o(.rodata);
src/battle_records.o(.rodata);
data/data_83F5738.o(.rodata.83F6C90);
src/battle_transition.o(.rodata);
data/data_83F5738.o(.rodata.83FB134);
src/save.o(.rodata);
data/data_83FECCC.o(.rodata);
src/intro.o(.rodata);

3728
src/battle_transition.c Normal file
View File

File diff suppressed because it is too large Load Diff

8
src/diploma.c
View File

@ -35,7 +35,7 @@ static void DiplomaBgInit(void);
static void DiplomaPrintText(void);
static u8 DiplomaLoadGfx(void);
static void DiplomaVblankHandler(void);
static void CB2_DiplomaInit(void);
static void CB2_Diploma(void);
static void Task_WaitForExit(u8);
static void Task_DiplomaInit(u8);
static void Task_DiplomaReturnToOverworld(u8);
@ -101,10 +101,10 @@ void CB2_ShowDiploma(void)
gDiploma->callbackStep = 0;
DiplomaBgInit();
CreateTask(Task_DiplomaInit, 0);
SetMainCallback2(CB2_DiplomaInit);
SetMainCallback2(CB2_Diploma);
}
static void CB2_DiplomaInit(void)
static void CB2_Diploma(void)
{
RunTasks();
AnimateSprites();
@ -134,7 +134,7 @@ static void Task_DiplomaInit(u8 taskId)
case 4:
if (HasAllKantoMons())
{
SetGpuReg(REG_OFFSET_BG1HOFS, 0x80 << 1);
SetGpuReg(REG_OFFSET_BG1HOFS, 0x100);
}
else
{

4
src/pokemon.c
View File

@ -1621,7 +1621,7 @@ const u16 gLinkPlayerFacilityClasses[] =
FACILITY_CLASS_BEAUTY_2, FACILITY_CLASS_AQUA_LEADER,
};
const static struct OamData sOakSpeechNidoranFDummyOamData =
static const struct OamData sOakSpeechNidoranFDummyOamData =
{
.y = 0,
.affineMode = 0,
@ -1637,7 +1637,7 @@ const static struct OamData sOakSpeechNidoranFDummyOamData =
.paletteNum = 0,
};
const struct SpriteTemplate sOakSpeechNidoranFDummyTemplate =
static const struct SpriteTemplate sOakSpeechNidoranFDummyTemplate =
{
.tileTag = SPRITE_INVALID_TAG,
.paletteTag = SPRITE_INVALID_TAG,

4
src/teachy_tv.c
View File

@ -1208,11 +1208,11 @@ static void TeachyTvPreBattleAnimAndSetBattleCallback(u8 taskId)
switch (data[7])
{
case 0:
sub_80D08B8(data[6]);
BT_StartOnField(data[6]);
++data[7];
break;
case 1:
if (sub_80D08F8())
if (BT_IsDone())
{
SetMainCallback2(sub_800FD9C);
DestroyTask(taskId);

4
src/trainer_tower.c
View File

@ -1111,7 +1111,7 @@ void sub_815E114(void)
void sub_815E124(u8 taskId)
{
if (sub_80D08F8() == TRUE)
if (BT_IsDone() == TRUE)
{
gMain.savedCallback = sub_815E114;
CleanupOverworldWindowsAndTilemaps();
@ -1129,7 +1129,7 @@ void sub_815E160(void)
sub_815E9FC();
CreateTask(sub_815E124, 1);
PlayMapChosenOrBattleBGM(0);
sub_80D08B8(sub_8080060());
BT_StartOnField(sub_8080060());
}
void sub_815E1C0(void)

5
sym_ewram.txt
View File

@ -1055,10 +1055,7 @@ gUnknown_2039A24: @ 2039A24
.space 0x4
.include "src/coins.o"
.align 2
gUnknown_2039A2C: @ 2039A2C
.space 0x4
.include "src/battle_transition.o"
gUnknown_2039A30: @ 2039A30
.space 0x4