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

Merge pull request #164 from PikalaxALT/dism_more_data

Browse Source 
Battle Message et al
This commit is contained in:
PikalaxALT
2019-11-23 19:37:52 -05:00
committed by GitHub
parent 548490c675 14725e1592
commit 2177f1f40b
32 changed files with 2913 additions and 6222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_message.s
-3043
View File
File diff suppressed because it is too large Load Diff
baserom.ips
BIN
View File
Binary file not shown.
data/battle_message.s
-2923
View File
File diff suppressed because it is too large Load Diff
data/battle_scripts_1.s
+3 -3
View File
@@ -3167,7 +3167,7 @@ BattleScript_RainContinuesOrEndsEnd::
end2
BattleScript_DamagingWeatherContinues::
printfromtable gSandStormHailContinuesStringIds
printfromtable gSandstormHailContinuesStringIds
waitmessage 0x40
playanimation2 BS_ATTACKER, sB_ANIM_ARG1, NULL
setbyte gBattleCommunication, 0
@@ -3175,7 +3175,7 @@ BattleScript_DamagingWeatherLoop::
copyarraywithindex gBattlerAttacker, gBattlerByTurnOrder, gBattleCommunication, 1
weatherdamage
jumpifword CMP_EQUAL, gBattleMoveDamage, NULL, BattleScript_DamagingWeatherContinuesEnd
printfromtable gSandStormHailDmgStringIds
printfromtable gSandstormHailDmgStringIds
waitmessage 0x40
orword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 | HITMARKER_GRUDGE
effectivenesssound
@@ -3193,7 +3193,7 @@ BattleScript_WeatherDamageEndedBattle::
end2
BattleScript_SandStormHailEnds::
printfromtable gSandStormHailEndStringIds
printfromtable gSandstormHailEndStringIds
waitmessage 0x40
end2
data/field_player_avatar.s
+89 -24
View File
@@ -1,73 +1,138 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_835B764:: @ 835B764
.incbin "baserom.gba", 0x35B764, 0xB0
.4byte MetatileBehavior_IsUnknownMovement48, ForcedMovement_Slip
.4byte MetatileBehavior_IsIce_2, ForcedMovement_Slip
.4byte MetatileBehavior_IsWalkSouth, sub_805B750
.4byte MetatileBehavior_IsWalkNorth, sub_805B768
.4byte MetatileBehavior_IsWalkWest, sub_805B780
.4byte MetatileBehavior_IsWalkEast, sub_805B798
.4byte MetatileBehavior_IsSouthwardCurrent, sub_805B82C
.4byte MetatileBehavior_IsNorthwardCurrent, sub_805B844
.4byte MetatileBehavior_IsWestwardCurrent, sub_805B85C
.4byte MetatileBehavior_IsEastwardCurrent, sub_805B874
.4byte MetatileBehavior_UnusedIsSpinRight, sub_805B7B0
.4byte MetatileBehavior_UnusedIsSpinLeft, sub_805B7CC
.4byte MetatileBehavior_UnusedIsSpinUp, sub_805B7E8
.4byte MetatileBehavior_UnusedIsSpinDown, sub_805B804
.4byte MetatileBehavior_IsSlideSouth, ForcedMovement_SlideSouth
.4byte MetatileBehavior_IsSlideNorth, ForcedMovement_SlideNorth
.4byte MetatileBehavior_IsSlideWest, ForcedMovement_SlideWest
.4byte MetatileBehavior_IsSlideEast, ForcedMovement_SlideEast
.4byte MetatileBehavior_IsWaterfall, sub_805B82C
.4byte MetatileBehavior_UnusedReturnFalse_7, sub_805B924
.4byte MetatileBehavior_UnusedReturnFalse_8, sub_805B930
.4byte NULL, ForcedMovement_None
gUnknown_835B814:: @ 835B814
.incbin "baserom.gba", 0x35B814, 0xC
.4byte PlayerNotOnBikeNotMoving
.4byte sub_805B9C4
.4byte sub_805B9D4
gUnknown_835B820:: @ 835B820
.incbin "baserom.gba", 0x35B820, 0x8
.byte 0x04, 0x04, 0x05, 0x06, 0x07
.align 2
gUnknown_835B828:: @ 835B828
.incbin "baserom.gba", 0x35B828, 0x14
.4byte MetatileBehavior_ReturnFalse_14
.4byte MetatileBehavior_ReturnFalse_15
.4byte MetatileBehavior_ReturnFalse_16
.4byte MetatileBehavior_ReturnFalse_17
.4byte MetatileBehavior_ReturnFalse_18
gUnknown_835B83C:: @ 835B83C
.incbin "baserom.gba", 0x35B83C, 0x8
.byte 0x09, 0x0a, 0x0b, 0x0c, 0x0d
.align 2
gUnknown_835B844:: @ 835B844
.incbin "baserom.gba", 0x35B844, 0x20
.4byte sub_805BE60
.4byte sub_805BE74
.4byte sub_805BE74
.4byte sub_805BE90
.4byte nullsub_23
.4byte PlayerAvatarTransition_ReturnToField
.4byte nullsub_22
.4byte nullsub_22
gUnknown_835B864:: @ 835B864
.incbin "baserom.gba", 0x35B864, 0x10
.4byte MetatileBehavior_IsSouthArrowWarp
.4byte MetatileBehavior_IsNorthArrowWarp
.4byte MetatileBehavior_IsWestArrowWarp
.4byte MetatileBehavior_IsEastArrowWarp
gUnknown_835B874:: @ 835B874
.incbin "baserom.gba", 0x35B874, 0xC
.byte 0x00, 0x07, 0x01, 0x08, 0x02, 0x09, 0x03, 0x0a, 0x04, 0x0b, 0x05, 0x0c
gUnknown_835B880:: @ 835B880
.incbin "baserom.gba", 0x35B880, 0x2
.byte 0x0e, 0x0f
gUnknown_835B882:: @ 835B882
.incbin "baserom.gba", 0x35B882, 0xC
.byte 0x00, 0x01, 0x01, 0x02, 0x02, 0x08, 0x07, 0x01, 0x08, 0x02, 0x09, 0x08
gUnknown_835B88E:: @ 835B88E
.incbin "baserom.gba", 0x35B88E, 0x2
.byte 0x06, 0x0d
gUnknown_835B890:: @ 835B890
.incbin "baserom.gba", 0x35B890, 0x10
.4byte MetatileBehavior_IsSouthArrowWarp
.4byte MetatileBehavior_IsNorthArrowWarp
.4byte MetatileBehavior_IsWestArrowWarp
.4byte MetatileBehavior_IsEastArrowWarp
gUnknown_835B8A0:: @ 835B8A0
.incbin "baserom.gba", 0x35B8A0, 0xC
.4byte sub_805CD64
.4byte sub_805CD84
.4byte sub_805CE20
gUnknown_835B8AC:: @ 835B8AC
.incbin "baserom.gba", 0x35B8AC, 0x4
.4byte PlayerAvatar_DoSecretBaseMatJump
gUnknown_835B8B0:: @ 835B8B0
.incbin "baserom.gba", 0x35B8B0, 0x10
.4byte sub_805CFC4
.4byte sub_805CFEC
.4byte sub_805D064
.4byte sub_805D0A4
gUnknown_835B8C0:: @ 835B8C0
.incbin "baserom.gba", 0x35B8C0, 0x4
.byte 0x03, 0x04, 0x02, 0x01
gUnknown_835B8C4:: @ 835B8C4
.incbin "baserom.gba", 0x35B8C4, 0x8
.byte 0x18, 0x18, 0x19, 0x1a, 0x1b
.align 2
gUnknown_835B8CC:: @ 835B8CC
.incbin "baserom.gba", 0x35B8CC, 0x40
.4byte sub_805D33C
.4byte fish1
.4byte fish2
.4byte sub_805D430
.4byte sub_805D47C
.4byte sub_805D508
.4byte sub_805D574
.4byte sub_805D580
.4byte sub_805D5EC
.4byte sub_805D66C
.4byte sub_805D6C8
.4byte sub_805D7C0
.4byte sub_805D838
.4byte sub_805D8AC
.4byte sub_805D8D8
.4byte sub_805D980
gUnknown_835B90C:: @ 835B90C
.incbin "baserom.gba", 0x35B90C, 0x6
.2byte 0x0001, 0x0001, 0x0001
gUnknown_835B912:: @ 835B912
.incbin "baserom.gba", 0x35B912, 0x6
.2byte 0x0001, 0x0003, 0x0006
gUnknown_835B918:: @ 835B918
.incbin "baserom.gba", 0x35B918, 0x2
.string "·$"
gUnknown_835B91A:: @ 835B91A
.incbin "baserom.gba", 0x35B91A, 0x6
.2byte 0x0024, 0x0021, 0x001e
gUnknown_835B920:: @ 835B920
.incbin "baserom.gba", 0x35B920, 0xC
.2byte 0x0000, 0x0000, 0x0028, 0x000a, 0x0046, 0x001e
gUnknown_835B92C:: @ 835B92C
.incbin "baserom.gba", 0x35B92C, 0x8
.byte 0x01, 0x03, 0x04, 0x02, 0x01
data/pokemon_special_anim.s
+170 -46
View File
@@ -6,71 +6,195 @@
.section .rodata
.align 2
gUnknown_8459634:: @ 8459634
.incbin "baserom.gba", 0x459634, 0x8
gUnknown_8459634:: @ 8459634 data16 2x2
.2byte 0x0044, 0x0000
.2byte 0x000d, 0x0001
gUnknown_845963C:: @ 845963C
.incbin "baserom.gba", 0x45963C, 0x20
gUnknown_845963C:: @ 845963C gbapal
.incbin "graphics/pokemon_special_anim/unk_845963C.gbapal"
gUnknown_845965C:: @ 845965C
.incbin "baserom.gba", 0x45965C, 0x20
gUnknown_845965C:: @ 845965C gbapal
.incbin "graphics/pokemon_special_anim/unk_845965C.gbapal"
gUnknown_845967C:: @ 845967C
.incbin "baserom.gba", 0x45967C, 0xC0
gUnknown_845967C:: @ 845967C 4bpp.lz
.incbin "graphics/pokemon_special_anim/unk_845967C.4bpp.lz"
gUnknown_845973C:: @ 845973C
.incbin "baserom.gba", 0x45973C, 0x12C
gUnknown_845973C:: @ 845973C bin.lz
.incbin "graphics/pokemon_special_anim/unk_845973C.bin.lz"
gUnknown_8459868:: @ 8459868
.incbin "baserom.gba", 0x459868, 0x20
gUnknown_8459868:: @ 8459868 gbapal
.incbin "graphics/pokemon_special_anim/unk_8459868.gbapal"
gUnknown_8459888:: @ 8459888
.incbin "baserom.gba", 0x459888, 0xF8
gUnknown_8459888:: @ 8459888 4bpp.lz
.incbin "graphics/pokemon_special_anim/unk_8459888.4bpp.lz"
gUnknown_8459980:: @ 8459980
.incbin "baserom.gba", 0x459980, 0x8
gUnknown_84598A4:: @ 84598A4 gbapal
.incbin "graphics/pokemon_special_anim/unk_84598A4.gbapal"
gUnknown_8459988:: @ 8459988
.incbin "baserom.gba", 0x459988, 0x10
gUnknown_84598C4:: @ 84598C4 4bpp.lz
.incbin "graphics/pokemon_special_anim/unk_84598C4.4bpp.lz"
gUnknown_8459998:: @ 8459998
.incbin "baserom.gba", 0x459998, 0x12
gUnknown_8459940:: @ 8459940 gbapal
.incbin "graphics/pokemon_special_anim/unk_8459940.gbapal"
gUnknown_84599AA:: @ 84599AA
.incbin "baserom.gba", 0x4599AA, 0x8
gUnknown_8459960:: @ 8459960 4bpp.lz
.incbin "graphics/pokemon_special_anim/unk_8459960.4bpp.lz"
gUnknown_84599B2:: @ 84599B2
.incbin "baserom.gba", 0x4599B2, 0x6
gUnknown_8459980:: @ 8459980 bg_template
.4byte 0x000041f0
@ {
@ .bg = 0,
@ .charBaseIndex = 0,
@ .mapBaseIndex = 31,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 0,
@ .baseTile = 0x0001
@ }
.4byte 0x000031cf
@ {
@ .bg = 3,
@ .charBaseIndex = 3,
@ .mapBaseIndex = 28,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 3,
@ .baseTile = 0x0000
@ }
gUnknown_84599B8:: @ 84599B8
.incbin "baserom.gba", 0x4599B8, 0x8
gUnknown_8459988:: @ 8459988 window_template
.byte 0, 1, 15, 28, 4, 15
.2byte 0x000a
.byte 255, 0, 0, 0, 0, 0
.2byte 0x0000
gUnknown_84599C0:: @ 84599C0
.incbin "baserom.gba", 0x4599C0, 0x8
gUnknown_8459998:: @ 8459998 dataptr
.4byte gUnknown_841B2ED @ 1,
.4byte gUnknown_841B2F1 @ 2, and ‥ ‥ ‥
.4byte gUnknown_841B2FF @ Poof!
gUnknown_84599C8:: @ 84599C8
.incbin "baserom.gba", 0x4599C8, 0x8
gUnknown_84599A4:: @ 84599A4
.2byte 0x0000, 0x0010
gUnknown_84599D0:: @ 84599D0
.incbin "baserom.gba", 0x4599D0, 0x50
gUnknown_84599A8:: @ 84599A8 unref, data16?
.2byte 0x0044
gUnknown_8459A20:: @ 8459A20
.incbin "baserom.gba", 0x459A20, 0x10
gUnknown_84599AA:: @ 84599AA data16
.2byte 0x0100, 0x0155, 0x01aa, 0x0200
gUnknown_8459A30:: @ 8459A30
.incbin "baserom.gba", 0x459A30, 0x78
gUnknown_84599B2:: @ 84599B2 data8
.byte 0xf8, 0xf8, 0x06, 0xf3, 0x08, 0xf8
gUnknown_8459AA8:: @ 8459AA8
.incbin "baserom.gba", 0x459AA8, 0x24
gUnknown_84599B8:: @ 84599B8 sprite_sheet
obj_tiles gUnknown_84598C4, 0x0080, 2
gUnknown_8459ACC:: @ 8459ACC
.incbin "baserom.gba", 0x459ACC, 0x20
gUnknown_84599C0:: @ 84599C0 sprite_palette
obj_pal gUnknown_84598A4, 2
gUnknown_8459AEC:: @ 8459AEC
.incbin "baserom.gba", 0x459AEC, 0x44
gUnknown_84599C8:: @ 84599C8 sprite_sheet
obj_tiles gUnknown_8459960, 0x0060, 5
gUnknown_8459B30:: @ 8459B30
.incbin "baserom.gba", 0x459B30, 0x18
gUnknown_84599D0:: @ 84599D0 sprite_palette
obj_pal gUnknown_8459940, 5
gUnknown_8459B48:: @ 8459B48
.incbin "baserom.gba", 0x459B48, 0x18
gUnknown_84599D8:: @ 84599D8
.4byte 0xc0000300, 0x00000400
gUnknown_84599E0:: @ 84599E0
obj_rot_scal_anim_frame 256, 256, 0, 0
obj_rot_scal_anim_end
gUnknown_84599F0:: @ 84599F0
obj_rot_scal_anim_frame 341, 341, 0, 0
obj_rot_scal_anim_end
gUnknown_8459A00:: @ 8459A00
obj_rot_scal_anim_frame 426, 426, 0, 0
obj_rot_scal_anim_end
gUnknown_8459A10:: @ 8459A10
obj_rot_scal_anim_frame 512, 512, 0, 0
obj_rot_scal_anim_end
gUnknown_8459A20:: @ 8459A20 dataptr
.4byte gUnknown_84599E0
.4byte gUnknown_84599F0
.4byte gUnknown_8459A00
.4byte gUnknown_8459A10
gUnknown_8459A30:: @ 8459A30 spr_template
spr_template 0, 0, gUnknown_84599D8, gDummySpriteAnimTable, NULL, gUnknown_8459A20, SpriteCallbackDummy
gUnknown_8459A48:: @ 8459A48 affine_anim_cmd?
obj_rot_scal_anim_frame 256, 256, 0, 0
obj_rot_scal_anim_frame -28, -28, 0, 8
obj_rot_scal_anim_end
gUnknown_8459A60:: @ 459A60
obj_rot_scal_anim_frame 341, 341, 0, 0
obj_rot_scal_anim_frame -37, -37, 0, 8
obj_rot_scal_anim_end
gUnknown_8459A78:: @ 459A78
obj_rot_scal_anim_frame 426, 426, 0, 0
obj_rot_scal_anim_frame -47, -47, 0, 8
obj_rot_scal_anim_end
gUnknown_8459A90:: @ 459A90
obj_rot_scal_anim_frame 512, 512, 0, 0
obj_rot_scal_anim_frame -56, -56, 0, 8
obj_rot_scal_anim_end
gUnknown_8459AA8:: @ 8459AA8 dataptr
.4byte gUnknown_8459A48
.4byte gUnknown_8459A60
.4byte gUnknown_8459A78
.4byte gUnknown_8459A90
gUnknown_8459AB8:: @ 8459AB8
.4byte 0x00008400, 0x00000400
gUnknown_8459AC0:: @ 8459AC0
obj_image_anim_frame 0x0000, 3
obj_image_anim_end
gUnknown_8459AC8:: @ 8459AC8
.4byte gUnknown_8459AC0
gUnknown_8459ACC:: @ 8459ACC spr_template
spr_template 0, 0, gUnknown_8459AB8, gUnknown_8459AC8, NULL, gDummySpriteAffineAnimTable, sub_811E7B4
gUnknown_8459AE4:: @ 8459AE4
.4byte 0x40000000, 0x00000400
gUnknown_8459AEC:: @ 8459AEC spr_template
spr_template 2, 2, gUnknown_8459AE4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_811E300
gUnknown_8459B04:: @ 8459B04
.4byte 0x00000000, 0x00000000
gUnknown_8459B0C:: @ 8459B0C
obj_image_anim_frame 0x0000, 16
obj_image_anim_frame 0x0001, 8
obj_image_anim_frame 0x0002, 4
obj_image_anim_end
gUnknown_8459B1C:: @ 8459B1C
obj_image_anim_frame 0x0001, 4
obj_image_anim_frame 0x0000, 4
obj_image_anim_end
gUnknown_8459B28:: @ 8459B28
.4byte gUnknown_8459B0C
.4byte gUnknown_8459B1C
gUnknown_8459B30:: @ 8459B30 spr_template
spr_template 5, 5, gUnknown_8459B04, gUnknown_8459B28, NULL, gDummySpriteAffineAnimTable, sub_811E520
gUnknown_8459B48:: @ 8459B48 dataptr
.4byte gUnknown_841B2A9
.4byte gUnknown_841B2B7
.4byte gUnknown_841B2BE
.4byte gUnknown_841B2CC
.4byte gUnknown_841B2D4
.4byte gUnknown_841B2C6
graphics/pokemon_special_anim/unk_845963C.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 222 205
255 222 189
255 222 180
255 213 180
255 205 180
255 205 164
255 205 156
255 205 139
0 0 0
255 197 139
255 172 131
255 213 156
0 0 0
0 0 0
0 0 0
graphics/pokemon_special_anim/unk_845965C.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
222 238 255
213 238 255
213 230 255
213 230 255
205 230 255
205 222 255
205 222 255
197 222 255
0 0 0
189 222 255
172 213 255
205 230 255
0 0 0
0 0 0
0 0 0
graphics/pokemon_special_anim/unk_845967C.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 272 B

graphics/pokemon_special_anim/unk_845973C.bin
BIN
View File
Binary file not shown.
graphics/pokemon_special_anim/unk_8459868.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 255 255
230 230 255
213 213 255
197 197 255
180 180 255
164 164 255
148 148 255
131 131 255
115 115 255
98 98 255
82 82 255
65 65 255
49 49 255
32 32 255
16 16 255
graphics/pokemon_special_anim/unk_8459888.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 152 B

graphics/pokemon_special_anim/unk_84598A4.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
98 90 8
197 189 24
246 246 0
148 139 16
246 238 32
222 213 0
213 197 0
180 164 0
49 41 0
172 148 32
189 164 49
0 0 0
0 0 0
0 0 0
0 0 0
graphics/pokemon_special_anim/unk_84598C4.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 226 B

graphics/pokemon_special_anim/unk_8459940.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
65 106 255
255 255 255
230 230 230
213 213 213
197 197 197
180 180 180
164 164 164
148 148 148
131 131 131
115 115 115
98 98 98
82 82 82
65 65 65
49 49 49
32 32 32
16 16 16
graphics/pokemon_special_anim/unk_8459960.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 160 B

include/battle.h
+1 -2
View File
@@ -24,8 +24,7 @@
#define TRAINER_OPPONENT_3FE 0x3FE
#define TRAINER_OPPONENT_C00 0xC00
#define TRAINER_OPPONENT_800 0x800
#define STEVEN_PARTNER_ID 0xC03
#define TRAINER_LINK_OPPONENT 0x800
#define SECRET_BASE_OPPONENT 0x400
#define B_ACTION_USE_MOVE 0
include/battle_message.h
+3 -7
View File
@@ -51,13 +51,9 @@
#define B_TXT_DEF_PREFIX2 0x2B
#define B_TXT_ATK_PREFIX3 0x2C
#define B_TXT_DEF_PREFIX3 0x2D
#define B_TXT_TRAINER2_CLASS 0x2E
#define B_TXT_TRAINER2_NAME 0x2F
#define B_TXT_TRAINER2_LOSE_TEXT 0x30
#define B_TXT_TRAINER2_WIN_TEXT 0x31
#define B_TXT_PARTNER_CLASS 0x32
#define B_TXT_PARTNER_NAME 0x33
#define B_TXT_BUFF3 0x34
#define B_TXT_TRAINER2_LOSE_TEXT 0x2E
#define B_TXT_TRAINER2_WIN_TEXT 0x2F
#define B_TXT_BUFF3 0x30
// for B_TXT_BUFF1, B_TXT_BUFF2 and B_TXT_BUFF3
include/battle_string_ids.h
+1 -1
View File
@@ -387,6 +387,6 @@
#define STRINGID_TRAINER1MON2COMEBACK 384
#define STRINGID_TRAINER1MON1AND2COMEBACK 385
#define BATTLESTRINGS_COUNT 386
#define BATTLESTRINGS_COUNT 374
#endif // GUARD_BATTLE_STRING_IDS_H
include/battle_tower.h
+5
View File
@@ -31,5 +31,10 @@ void ValidateEReaderTrainer(void);
u8 GetBattleTowerTrainerFrontSpriteId(void);
u8 GetEreaderTrainerFrontSpriteId(void);
void CopyEReaderTrainerName5(u8 *dest);
void sub_815DC40(u8 *dest, u8 opponentIdx);
void sub_815DBF4(u8 *dest, u8 opponentIdx);
void GetBattleTowerTrainerName(u8 *text);
u8 GetEreaderTrainerClassId(void);
u8 GetBattleTowerTrainerClassNameId(void);
#endif //GUARD_BATTLE_TOWER_H
include/constants/trainers.h
-149
View File
@@ -170,155 +170,6 @@
#define F_TRAINER_FEMALE (1 << 7)
#define TRAINER_PIC_AQUA_LEADER_ARCHIE 0
#define TRAINER_PIC_AQUA_GRUNT_M 1
#define TRAINER_PIC_AQUA_GRUNT_F 2
#define TRAINER_PIC_RS_AROMA_LADY 3
#define TRAINER_PIC_RS_RUIN_MANIAC 4
#define TRAINER_PIC_INTERVIEWER 5
#define TRAINER_PIC_RS_TUBER_F 6
#define TRAINER_PIC_TUBER_M 7
#define TRAINER_PIC_RS_COOLTRAINER_M 8
#define TRAINER_PIC_RS_COOLTRAINER_F 9
#define TRAINER_PIC_HEX_MANIAC 10
#define TRAINER_PIC_RS_LADY 11
#define TRAINER_PIC_RS_BEAUTY 12
#define TRAINER_PIC_RICH_BOY 13
#define TRAINER_PIC_RS_POKEMANIAC 14
#define TRAINER_PIC_RS_SWIMMER_M 15
#define TRAINER_PIC_RS_BLACK_BELT 16
#define TRAINER_PIC_GUITARIST 17
#define TRAINER_PIC_KINDLER 18
#define TRAINER_PIC_RS_CAMPER 19
#define TRAINER_PIC_BUG_MANIAC 20
#define TRAINER_PIC_RS_PSYCHIC_M 21
#define TRAINER_PIC_RS_PSYCHIC_F 22
#define TRAINER_PIC_RS_GENTLEMAN 23
#define TRAINER_PIC_ELITE_FOUR_SIDNEY 24
#define TRAINER_PIC_ELITE_FOUR_PHOEBE 25
#define TRAINER_PIC_LEADER_ROXANNE 26
#define TRAINER_PIC_LEADER_BRAWLY 27
#define TRAINER_PIC_LEADER_TATE_AND_LIZA 28
#define TRAINER_PIC_SCHOOL_KID_M 29
#define TRAINER_PIC_SCHOOL_KID_F 30
#define TRAINER_PIC_SR_AND_JR 31
#define TRAINER_PIC_POKEFAN_M 32
#define TRAINER_PIC_POKEFAN_F 33
#define TRAINER_PIC_EXPERT_M 34
#define TRAINER_PIC_EXPERT_F 35
#define TRAINER_PIC_RS_YOUNGSTER 36
#define TRAINER_PIC_CHAMPION_STEVEN 37
#define TRAINER_PIC_RS_FISHERMAN 38
#define TRAINER_PIC_CYCLING_TRIATHLETE_M 39
#define TRAINER_PIC_CYCLING_TRIATHLETE_F 40
#define TRAINER_PIC_RUNNING_TRIATHLETE_M 41
#define TRAINER_PIC_RUNNING_TRIATHLETE_F 42
#define TRAINER_PIC_SWIMMING_TRIATHLETE_M 43
#define TRAINER_PIC_SWIMMING_TRIATHLETE_F 44
#define TRAINER_PIC_DRAGON_TAMER 45
#define TRAINER_PIC_RS_BIRD_KEEPER 46
#define TRAINER_PIC_NINJA_BOY 47
#define TRAINER_PIC_BATTLE_GIRL 48
#define TRAINER_PIC_PARASOL_LADY 49
#define TRAINER_PIC_RS_SWIMMER_F 50
#define TRAINER_PIC_RS_PICNICKER 51
#define TRAINER_PIC_RS_TWINS 52
#define TRAINER_PIC_RS_SAILOR 53
#define TRAINER_PIC_COLLECTOR 54
#define TRAINER_PIC_WALLY 55
#define TRAINER_PIC_RS_BRENDAN_1 56
#define TRAINER_PIC_RS_MAY_1 57
#define TRAINER_PIC_POKEMON_BREEDER_M 58
#define TRAINER_PIC_RS_POKEMON_BREEDER_F 59
#define TRAINER_PIC_RS_POKEMON_RANGER_M 60
#define TRAINER_PIC_RS_POKEMON_RANGER_F 61
#define TRAINER_PIC_MAGMA_LEADER_MAXIE 62
#define TRAINER_PIC_MAGMA_GRUNT_M 63
#define TRAINER_PIC_MAGMA_GRUNT_F 64
#define TRAINER_PIC_RS_LASS 65
#define TRAINER_PIC_RS_BUG_CATCHER 66
#define TRAINER_PIC_RS_HIKER 67
#define TRAINER_PIC_RS_YOUNG_COUPLE 68
#define TRAINER_PIC_OLD_COUPLE 69
#define TRAINER_PIC_RS_SIS_AND_BRO 70
#define TRAINER_PIC_AQUA_ADMIN_M 71
#define TRAINER_PIC_AQUA_ADMIN_F 72
#define TRAINER_PIC_MAGMA_ADMIN_M 73
#define TRAINER_PIC_MAGMA_ADMIN_F 74
#define TRAINER_PIC_LEADER_WATTSON 75
#define TRAINER_PIC_LEADER_FLANNERY 76
#define TRAINER_PIC_LEADER_NORMAN 77
#define TRAINER_PIC_LEADER_WINONA 78
#define TRAINER_PIC_LEADER_WALLACE 79
#define TRAINER_PIC_ELITE_FOUR_GLACIA 80
#define TRAINER_PIC_ELITE_FOUR_DRAKE 81
#define TRAINER_PIC_YOUNGSTER 82
#define TRAINER_PIC_BUG_CATCHER 83
#define TRAINER_PIC_LASS 84
#define TRAINER_PIC_SAILOR 85
#define TRAINER_PIC_CAMPER 86
#define TRAINER_PIC_PICNICKER 87
#define TRAINER_PIC_POKEMANIAC 88
#define TRAINER_PIC_SUPER_NERD 89
#define TRAINER_PIC_HIKER 90
#define TRAINER_PIC_BIKER 91
#define TRAINER_PIC_BURGLAR 92
#define TRAINER_PIC_ENGINEER 93
#define TRAINER_PIC_FISHERMAN 94
#define TRAINER_PIC_SWIMMER_M 95
#define TRAINER_PIC_CUE_BALL 96
#define TRAINER_PIC_GAMER 97
#define TRAINER_PIC_BEAUTY 98
#define TRAINER_PIC_SWIMMER_F 99
#define TRAINER_PIC_PSYCHIC_M 100
#define TRAINER_PIC_ROCKER 101
#define TRAINER_PIC_JUGGLER 102
#define TRAINER_PIC_TAMER 103
#define TRAINER_PIC_BIRD_KEEPER 104
#define TRAINER_PIC_BLACK_BELT 105
#define TRAINER_PIC_RIVAL_1 106
#define TRAINER_PIC_SCIENTIST 107
#define TRAINER_PIC_LEADER_GIOVANNI 108
#define TRAINER_PIC_ROCKET_GRUNT_M 109
#define TRAINER_PIC_COOLTRAINER_M 110
#define TRAINER_PIC_COOLTRAINER_F 111
#define TRAINER_PIC_ELITE_FOUR_LORELEI 112
#define TRAINER_PIC_ELITE_FOUR_BRUNO 113
#define TRAINER_PIC_ELITE_FOUR_AGATHA 114
#define TRAINER_PIC_ELITE_FOUR_LANCE 115
#define TRAINER_PIC_LEADER_BROCK 116
#define TRAINER_PIC_LEADER_MISTY 117
#define TRAINER_PIC_LEADER_LT_SURGE 118
#define TRAINER_PIC_LEADER_ERIKA 119
#define TRAINER_PIC_LEADER_KOGA 120
#define TRAINER_PIC_LEADER_BLAINE 121
#define TRAINER_PIC_LEADER_SABRINA 122
#define TRAINER_PIC_GENTLEMAN 123
#define TRAINER_PIC_RIVAL_2 124
#define TRAINER_PIC_CHAMPION_RIVAL 125
#define TRAINER_PIC_CHANNELER 126
#define TRAINER_PIC_TWINS 127
#define TRAINER_PIC_COOL_COUPLE 128
#define TRAINER_PIC_YOUNG_COUPLE 129
#define TRAINER_PIC_CRUSH_KIN 130
#define TRAINER_PIC_SIS_AND_BRO 131
#define TRAINER_PIC_PROFESSOR_OAK 132
#define TRAINER_PIC_RS_BRENDAN_2 133
#define TRAINER_PIC_RS_MAY_2 134
#define TRAINER_PIC_RED 135
#define TRAINER_PIC_LEAF 136
#define TRAINER_PIC_ROCKET_GRUNT_F 137
#define TRAINER_PIC_PSYCHIC_F 138
#define TRAINER_PIC_CRUSH_GIRL 139
#define TRAINER_PIC_TUBER_F 140
#define TRAINER_PIC_POKEMON_BREEDER_F 141
#define TRAINER_PIC_POKEMON_RANGER_M 142
#define TRAINER_PIC_POKEMON_RANGER_F 143
#define TRAINER_PIC_AROMA_LADY 144
#define TRAINER_PIC_RUIN_MANIAC 145
#define TRAINER_PIC_LADY 146
#define TRAINER_PIC_PAINTER 147
#define TRAINER_NONE 0
#define TRAINER_AQUA_LEADER_1 1
#define TRAINER_TEAM_AQUA_1 2
include/data.h
+2
View File
@@ -22,6 +22,8 @@ extern const u16 gUnknown_8251FEE[];
extern const u16 gUnknown_8252324[];
extern const u16 gUnknown_82539D4[];
extern const u8 gTrainerClassNames[][13];
extern const struct MonCoords gMonFrontPicCoords[];
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
extern const struct MonCoords gMonBackPicCoords[];
include/event_scripts.h
+6
View File
@@ -1188,4 +1188,10 @@ extern const u8 Text_1BCAF2[];
extern const u8 EventScript_RepelWoreOff[];
// battle_message
extern const u8 Text_1A5CF1[];
extern const u8 Text_1A5D31[];
extern const u8 Text_1A5D6E[];
extern const u8 Text_1A5DB1[];
#endif //GUARD_EVENT_SCRIPTS_H
include/fldeff.h
-1
View File
@@ -7,7 +7,6 @@
gTasks[taskId].data[8] = (u32)func >> 16; \
gTasks[taskId].data[9] = (u32)func;
extern u8 *gUnknown_203AAB0;
extern struct MapPosition gPlayerFacingPosition;
bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId);
include/graphics.h
+3
View File
@@ -4239,4 +4239,7 @@ extern const u16 gUnknown_8E97DDC[];
extern const u32 gUnknown_8E97DFC[];
extern const u32 gUnknown_8E97EC4[];
// battle_message
extern const u16 gUnknown_8D2FBB4[];
#endif //GUARD_GRAPHICS_H
include/strings.h
+5 -5
View File
@@ -187,13 +187,13 @@ extern const u8 gUnknown_84162BD[];
extern const u8 gUnknown_841D148[];
// pokemon
extern const u8 BattleText_Rose[];
extern const u8 BattleText_UnknownString3[];
extern const u8 BattleText_GetPumped[];
extern const u8 BattleText_MistShroud[];
extern const u8 gBattleText_Rose[];
extern const u8 gBattleText_UnknownString3[];
extern const u8 gBattleText_GetPumped[];
extern const u8 gBattleText_MistShroud[];
extern const u8 gText_BadEgg[];
extern const u8 gText_PkmnsXPreventsSwitching[];
extern u8 *gUnknown_83FD5D0[];
extern const u8 *const gStatNamesTable[];
// diploma
extern const u8 gUnknown_841B60E[];
include/trainer_tower.h
+2
View File
@@ -6,5 +6,7 @@ void InitTrainerTowerBattleStruct(void);
void FreeTrainerTowerBattleStruct(void);
u8 GetTrainerTowerTrainerFrontSpriteId(void);
void ResetTrainerTowerResults(void);
void sub_815DA28(u8 *text);
u8 sub_815DA10(void);
#endif //GUARD_TRAINER_TOWER_H
ld_script.txt
+2 -2
View File
@@ -195,7 +195,7 @@ SECTIONS {
src/fldeff_strength.o(.text);
src/battle_transition.o(.text);
src/battle_controller_link_partner.o(.text);
asm/battle_message.o(.text);
src/battle_message.o(.text);
src/math_util.o(.text);
src/roulette_util.o(.text);
src/cable_car_util.o(.text);
@@ -477,7 +477,7 @@ SECTIONS {
src/evolution_scene.o(.rodata);
src/battle_transition.o(.rodata);
src/battle_controller_link_partner.o(.rodata);
data/battle_message.o(.rodata);
src/battle_message.o(.rodata);
src/save.o(.rodata);
data/field_effect_helpers.o(.rodata);
src/battle_controller_safari.o(.rodata);
src/battle_message.c
+2515
View File
File diff suppressed because it is too large Load Diff
src/fldeff_sweetscent.c
+2
View File
@@ -13,6 +13,8 @@
#include "wild_encounter.h"
#include "constants/songs.h"
static EWRAM_DATA u8 *gUnknown_203AAB0 = NULL;
static void FieldCallback_SweetScent(void);
static void StartSweetScentFieldEffect(void);
static void TrySweetScentEncounter(u8 taskId);
src/pokemon.c
+5 -5
View File
@@ -4796,9 +4796,9 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit)
static void sub_8042D50(int stat)
{
gBattlerTarget = gBattlerInMenuId;
StringCopy(gBattleTextBuff1, gUnknown_83FD5D0[gUnknown_825DFF0[stat]]);
StringCopy(gBattleTextBuff2, BattleText_Rose);
BattleStringExpandPlaceholdersToDisplayedString(BattleText_UnknownString3);
StringCopy(gBattleTextBuff1, gStatNamesTable[gUnknown_825DFF0[stat]]);
StringCopy(gBattleTextBuff2, gBattleText_Rose);
BattleStringExpandPlaceholdersToDisplayedString(gBattleText_UnknownString3);
}
const u8 *Battle_PrintStatBoosterEffectMessage(u16 itemId)
@@ -4837,7 +4837,7 @@ const u8 *Battle_PrintStatBoosterEffectMessage(u16 itemId)
else
{
gBattlerAttacker = gBattlerInMenuId;
BattleStringExpandPlaceholdersToDisplayedString(BattleText_GetPumped);
BattleStringExpandPlaceholdersToDisplayedString(gBattleText_GetPumped);
}
}
}
@@ -4845,7 +4845,7 @@ const u8 *Battle_PrintStatBoosterEffectMessage(u16 itemId)
if (itemEffect[3] & 0x80)
{
gBattlerAttacker = gBattlerInMenuId;
BattleStringExpandPlaceholdersToDisplayedString(BattleText_MistShroud);
BattleStringExpandPlaceholdersToDisplayedString(gBattleText_MistShroud);
}
return gDisplayedStringBattle;
sym_ewram.txt
+4 -11
View File
@@ -426,21 +426,14 @@ gPlayerFacingPosition: @ 2039A04
.include "src/coins.o"
.align 2
.include "src/battle_transition.o"
gUnknown_2039A30: @ 2039A30
.space 0x4
gUnknown_2039A34: @ 2039A34
.space 0x4
.align 2
.include "src/battle_message.o"
.align 2
.include "src/save.o"
.align 2
.include "src/mystery_event_script.o"
gUnknown_203AAB0: @ 203AAB0
.space 0x4
.align 2
.include "src/fldeff_sweetscent.o"
.align 2
.include "src/learn_move.o"
.align 2