ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

finish porting cam's port

Browse Source
This commit is contained in:
DizzyEggg 2017-09-17 15:19:15 +02:00
parent a9a66b06ef
commit c7592bc87c
7 changed files with 4128 additions and 3641 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3583
asm/battle_3.s
View File

File diff suppressed because it is too large Load Diff

4
asm/battle_4.s
View File

@ -29296,12 +29296,12 @@ atkE7_castform_data_change: @ 8055E64
str r0, [r1] str r0, [r1]
ldr r0, =gBattleScripting ldr r0, =gBattleScripting
ldrb r0, [r0, 0x17] ldrb r0, [r0, 0x17]
bl castform_switch bl CastformDataTypeChange
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
cmp r4, 0 cmp r4, 0
beq _08055E8E beq _08055E8E
ldr r0, =gUnknown_082DB4A9 ldr r0, =BattleScript_CastformChange
bl b_push_move_exec bl b_push_move_exec
ldr r0, =gBattleStruct ldr r0, =gBattleStruct
ldr r0, [r0] ldr r0, [r0]

36
data/battle_scripts_1.s
View File

@ -330,25 +330,25 @@ BattleScript_YawnMakesAsleep:: @ 82DB378
gUnknown_082DB422:: @ 82DB422 gUnknown_082DB422:: @ 82DB422
.incbin "baserom.gba", 0x2db422, 0xe .incbin "baserom.gba", 0x2db422, 0xe
gUnknown_082DB430:: @ 82DB430 BattleScript_DrizzleActivates:: @ 82DB430
.incbin "baserom.gba", 0x2db430, 0x14 .incbin "baserom.gba", 0x2db430, 0x14
gUnknown_082DB444:: @ 82DB444 BattleScript_SpeedBoostActivates:: @ 82DB444
.incbin "baserom.gba", 0x2db444, 0xe .incbin "baserom.gba", 0x2db444, 0xe
gUnknown_082DB452:: @ 82DB452 BattleScript_TraceActivates:: @ 82DB452
.incbin "baserom.gba", 0x2db452, 0xa .incbin "baserom.gba", 0x2db452, 0xa
gUnknown_082DB45C:: @ 82DB45C BattleScript_RainDishActivates:: @ 82DB45C
.incbin "baserom.gba", 0x2db45c, 0x14 .incbin "baserom.gba", 0x2db45c, 0x14
gUnknown_082DB470:: @ 82DB470 BattleScript_SandstreamActivates:: @ 82DB470
.incbin "baserom.gba", 0x2db470, 0x14 .incbin "baserom.gba", 0x2db470, 0x14
gUnknown_082DB484:: @ 82DB484 BattleScript_ShedSkinActivates:: @ 82DB484
.incbin "baserom.gba", 0x2db484, 0x25 .incbin "baserom.gba", 0x2db484, 0x25
gUnknown_082DB4A9:: @ 82DB4A9 BattleScript_CastformChange:: @ 82DB4A9
.incbin "baserom.gba", 0x2db4a9, 0xf .incbin "baserom.gba", 0x2db4a9, 0xf
gUnknown_082DB4B8:: @ 82DB4B8 gUnknown_082DB4B8:: @ 82DB4B8
@ -357,7 +357,7 @@ gUnknown_082DB4B8:: @ 82DB4B8
gUnknown_082DB4C1:: @ 82DB4C1 gUnknown_082DB4C1:: @ 82DB4C1
.incbin "baserom.gba", 0x2db4c1, 0x69 .incbin "baserom.gba", 0x2db4c1, 0x69
gUnknown_082DB52A:: @ 82DB52A BattleScript_DroughtActivates:: @ 82DB52A
.incbin "baserom.gba", 0x2db52a, 0x14 .incbin "baserom.gba", 0x2db52a, 0x14
gUnknown_082DB53E:: @ 82DB53E gUnknown_082DB53E:: @ 82DB53E
@ -369,10 +369,10 @@ gUnknown_082DB552:: @ 82DB552
gUnknown_082DB560:: @ 82DB560 gUnknown_082DB560:: @ 82DB560
.incbin "baserom.gba", 0x2db560, 0xe .incbin "baserom.gba", 0x2db560, 0xe
gUnknown_082DB56E:: @ 82DB56E BattleScript_MoveHPDrain_PPLoss:: @ 82DB56E
.incbin "baserom.gba", 0x2db56e, 0x1 .incbin "baserom.gba", 0x2db56e, 0x1
gUnknown_082DB56F:: @ 82DB56F BattleScript_MoveHPDrain:: @ 82DB56F
.incbin "baserom.gba", 0x2db56f, 0x22 .incbin "baserom.gba", 0x2db56f, 0x22
gUnknown_082DB591:: @ 82DB591 gUnknown_082DB591:: @ 82DB591
@ -381,10 +381,10 @@ gUnknown_082DB591:: @ 82DB591
gUnknown_082DB592:: @ 82DB592 gUnknown_082DB592:: @ 82DB592
.incbin "baserom.gba", 0x2db592, 0x15 .incbin "baserom.gba", 0x2db592, 0x15
gUnknown_082DB5A7:: @ 82DB5A7 BattleScript_FlashFireBoost_PPLoss:: @ 82DB5A7
.incbin "baserom.gba", 0x2db5a7, 0x1 .incbin "baserom.gba", 0x2db5a7, 0x1
gUnknown_082DB5A8:: @ 82DB5A8 BattleScript_FlashFireBoost:: @ 82DB5A8
.incbin "baserom.gba", 0x2db5a8, 0x1f .incbin "baserom.gba", 0x2db5a8, 0x1f
gUnknown_082DB5C7:: @ 82DB5C7 gUnknown_082DB5C7:: @ 82DB5C7
@ -405,7 +405,7 @@ gUnknown_082DB5F5:: @ 82DB5F5
gUnknown_082DB603:: @ 82DB603 gUnknown_082DB603:: @ 82DB603
.incbin "baserom.gba", 0x2db603, 0x1c .incbin "baserom.gba", 0x2db603, 0x1c
gUnknown_082DB61F:: @ 82DB61F BattleScript_SoundproofProtected:: @ 82DB61F
.incbin "baserom.gba", 0x2db61f, 0x10 .incbin "baserom.gba", 0x2db61f, 0x10
gUnknown_082DB62F:: @ 82DB62F gUnknown_082DB62F:: @ 82DB62F
@ -414,19 +414,19 @@ gUnknown_082DB62F:: @ 82DB62F
gUnknown_082DB63F:: @ 82DB63F gUnknown_082DB63F:: @ 82DB63F
.incbin "baserom.gba", 0x2db63f, 0xe .incbin "baserom.gba", 0x2db63f, 0xe
gUnknown_082DB64D:: @ 82DB64D BattleScript_ColorChangeActivates:: @ 82DB64D
.incbin "baserom.gba", 0x2db64d, 0x7 .incbin "baserom.gba", 0x2db64d, 0x7
gUnknown_082DB654:: @ 82DB654 BattleScript_RoughSkinActivates:: @ 82DB654
.incbin "baserom.gba", 0x2db654, 0x1b .incbin "baserom.gba", 0x2db654, 0x1b
gUnknown_082DB66F:: @ 82DB66F BattleScript_CuteCharmActivates:: @ 82DB66F
.incbin "baserom.gba", 0x2db66f, 0xd .incbin "baserom.gba", 0x2db66f, 0xd
gUnknown_082DB67C:: @ 82DB67C BattleScript_ApplySecondaryEffect:: @ 82DB67C
.incbin "baserom.gba", 0x2db67c, 0x3 .incbin "baserom.gba", 0x2db67c, 0x3
gUnknown_082DB67F:: @ 82DB67F BattleScript_SynchronizeActivates:: @ 82DB67F
.incbin "baserom.gba", 0x2db67f, 0x3 .incbin "baserom.gba", 0x2db67f, 0x3
gUnknown_082DB682:: @ 82DB682 gUnknown_082DB682:: @ 82DB682

16
data/data2b.s
View File

@ -227,25 +227,25 @@ gUnknown_0831BC0C:: @ 831BC0C
gUnknown_0831BC44:: @ 831BC44 gUnknown_0831BC44:: @ 831BC44
.incbin "baserom.gba", 0x31bc44, 0x2c .incbin "baserom.gba", 0x31bc44, 0x2c
gUnknown_0831BC70:: @ 831BC70 gStatusConditionString_PoisonJpn:: @ 831BC70
.incbin "baserom.gba", 0x31bc70, 0x8 .incbin "baserom.gba", 0x31bc70, 0x8
gUnknown_0831BC78:: @ 831BC78 gStatusConditionString_SleepJpn:: @ 831BC78
.incbin "baserom.gba", 0x31bc78, 0x8 .incbin "baserom.gba", 0x31bc78, 0x8
gUnknown_0831BC80:: @ 831BC80 gStatusConditionString_ParalysisJpn:: @ 831BC80
.incbin "baserom.gba", 0x31bc80, 0x8 .incbin "baserom.gba", 0x31bc80, 0x8
gUnknown_0831BC88:: @ 831BC88 gStatusConditionString_BurnJpn:: @ 831BC88
.incbin "baserom.gba", 0x31bc88, 0x8 .incbin "baserom.gba", 0x31bc88, 0x8
gUnknown_0831BC90:: @ 831BC90 gStatusConditionString_IceJpn:: @ 831BC90
.incbin "baserom.gba", 0x31bc90, 0x8 .incbin "baserom.gba", 0x31bc90, 0x8
gUnknown_0831BC98:: @ 831BC98 gStatusConditionString_ConfusionJpn:: @ 831BC98
.incbin "baserom.gba", 0x31bc98, 0x8 .incbin "baserom.gba", 0x31bc98, 0x8
gUnknown_0831BCA0:: @ 831BCA0 gStatusConditionString_LoveJpn:: @ 831BCA0
.incbin "baserom.gba", 0x31bca0, 0x8 .incbin "baserom.gba", 0x31bca0, 0x8
gUnknown_0831BCA8:: @ 831BCA8 gUnknown_0831BCA8:: @ 831BCA8
@ -260,6 +260,6 @@ gUnknown_0831BCEF:: @ 831BCEF
gUnknown_0831BCF3:: @ 831BCF3 gUnknown_0831BCF3:: @ 831BCF3
.incbin "baserom.gba", 0x31bcf3, 0x5 .incbin "baserom.gba", 0x31bcf3, 0x5
gUnknown_0831BCF8:: @ 831BCF8 gSoundMovesTable:: @ 831BCF8
.incbin "baserom.gba", 0x31bcf8, 0x18 .incbin "baserom.gba", 0x31bcf8, 0x18

52
include/battle.h
View File

@ -26,6 +26,7 @@
#define BATTLE_TYPE_x100000 0x100000 #define BATTLE_TYPE_x100000 0x100000
#define BATTLE_TYPE_PYRAMID 0x200000 #define BATTLE_TYPE_PYRAMID 0x200000
#define BATTLE_TYPE_INGAME_PARTNER 0x400000 #define BATTLE_TYPE_INGAME_PARTNER 0x400000
#define BATTLE_TYPE_x800000 0x800000
#define BATTLE_TYPE_RECORDED 0x1000000 #define BATTLE_TYPE_RECORDED 0x1000000
#define BATTLE_TYPE_x2000000 0x2000000 #define BATTLE_TYPE_x2000000 0x2000000
#define BATTLE_TYPE_x4000000 0x4000000 #define BATTLE_TYPE_x4000000 0x4000000
@ -137,26 +138,26 @@
#define SIDE_STATUS_MIST (1 << 8) #define SIDE_STATUS_MIST (1 << 8)
#define SIDE_STATUS_SPIKES_DAMAGED (1 << 9) #define SIDE_STATUS_SPIKES_DAMAGED (1 << 9)
#define ABILITYEFFECT_ON_SWITCHIN 0x0 #define ABILITYEFFECT_ON_SWITCHIN 0x0
#define ABILITYEFFECT_ENDTURN 0x1 #define ABILITYEFFECT_ENDTURN 0x1
#define ABILITYEFFECT_MOVES_BLOCK 0x2 #define ABILITYEFFECT_MOVES_BLOCK 0x2
#define ABILITYEFFECT_ABSORBING 0x3 #define ABILITYEFFECT_ABSORBING 0x3
#define ABILITYEFFECT_CONTACT 0x4 #define ABILITYEFFECT_CONTACT 0x4
#define ABILITYEFFECT_IMMUNITY 0x5 #define ABILITYEFFECT_IMMUNITY 0x5
#define ABILITYEFFECT_FORECAST 0x6 #define ABILITYEFFECT_FORECAST 0x6
#define ABILITYEFFECT_SYNCHRONIZE 0x7 #define ABILITYEFFECT_SYNCHRONIZE 0x7
#define ABILITYEFFECT_ATK_SYNCHRONIZE 0x8 #define ABILITYEFFECT_ATK_SYNCHRONIZE 0x8
#define ABILITYEFFECT_INTIMIDATE1 0x9 #define ABILITYEFFECT_INTIMIDATE1 0x9
#define ABILITYEFFECT_INTIMIDATE2 0xA #define ABILITYEFFECT_INTIMIDATE2 0xA
#define ABILITYEFFECT_TRACE 0xB #define ABILITYEFFECT_TRACE 0xB
#define ABILITYEFFECT_CHECK_OTHER_SIDE 0xC #define ABILITYEFFECT_CHECK_OTHER_SIDE 0xC
#define ABILITYEFFECT_CHECK_BANK_SIDE 0xD #define ABILITYEFFECT_CHECK_BANK_SIDE 0xD
#define ABILITYEFFECT_FIELD_SPORT 0xE #define ABILITYEFFECT_FIELD_SPORT 0xE
#define ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK 0xF #define ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK 0xF
#define ABILITYEFFECT_COUNT_OTHER_SIZE 0x10 #define ABILITYEFFECT_COUNT_OTHER_SIZE 0x10
#define ABILITYEFFECT_COUNT_BANK_SIDE 0x11 #define ABILITYEFFECT_COUNT_BANK_SIDE 0x11
#define ABILITYEFFECT_COUNT_ON_FIELD 0x12 #define ABILITYEFFECT_COUNT_ON_FIELD 0x12
#define ABILITYEFFECT_CHECK_ON_FIELD 0x13 #define ABILITYEFFECT_CHECK_ON_FIELD 0x13
#define WEATHER_HAS_EFFECT ((!AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_AIR_LOCK, 0, 0))) #define WEATHER_HAS_EFFECT ((!AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_AIR_LOCK, 0, 0)))
@ -523,10 +524,7 @@ struct BattleStruct
u8 field_59; u8 field_59;
u8 field_5A; u8 field_5A;
u8 field_5B; u8 field_5B;
u8 field_5C; u8 field_5C[4];
u8 field_5D;
u8 field_5E;
u8 field_5F;
u8 field_60; u8 field_60;
u8 field_61; u8 field_61;
u8 field_62; u8 field_62;
@ -611,13 +609,13 @@ struct BattleStruct
u8 field_D0[8]; u8 field_D0[8];
u8 intimidateBank; u8 intimidateBank;
u8 fillerD9[0xDA-0xD9]; u8 fillerD9[0xDA-0xD9];
u8 unkDA; u8 field_DA;
u8 turnSideTracker; u8 turnSideTracker;
u8 fillerDC[0xDF-0xDC]; u8 fillerDC[0xDF-0xDC];
u8 unkDF; u8 field_DF;
u8 fillerE0[0x1A0-0xE0]; u8 fillerE0[0x1A0-0xE0];
u8 unk1A0; u8 field_1A0;
u8 unk1A1; u8 field_1A1;
u8 filler1A2; u8 filler1A2;
u8 atkCancellerTracker; u8 atkCancellerTracker;
}; };

6
include/pokemon.h
View File

@ -439,6 +439,12 @@ struct BattleMove
u8 flags; u8 flags;
}; };
#define FLAG_MAKES_CONTACT 0x1
#define FLAG_PROTECT_AFFECTED 0x2
#define FLAG_MAGICCOAT_AFFECTED 0x4
#define FLAG_SNATCH_AFFECTED 0x8
#define FLAG_KINGSROCK_AFFECTED 0x20
struct SpindaSpot struct SpindaSpot
{ {
u8 x, y; u8 x, y;

4072
src/battle_3.c
View File

File diff suppressed because it is too large Load Diff