merge branch master

This commit is contained in:
DizzyEggg 2017-10-10 11:48:16 +02:00
commit e382a73e9d
94 changed files with 18136 additions and 6683 deletions

View File

@ -1547,7 +1547,7 @@ _080358E0:
.4byte _08035A40
.4byte _08035A70
_08035904:
ldr r4, =gUnknown_0831ABA8
ldr r4, =gBattleTerrainTable
ldr r5, =gBattleTerrain
ldrb r1, [r5]
lsls r0, r1, 2
@ -2632,7 +2632,7 @@ _08036350:
lsls r0, 24
cmp r0, 0
bne _0803639C
ldr r4, =gUnknown_0831ABA8
ldr r4, =gBattleTerrainTable
ldr r5, =gBattleTerrain
ldrb r1, [r5]
lsls r0, r1, 2
@ -2778,7 +2778,7 @@ _080364A8:
.4byte _08036510
.4byte _08036518
_080364CC:
ldr r2, =gUnknown_0831ABA8
ldr r2, =gBattleTerrainTable
ldr r0, =gBattleTerrain
ldrb r1, [r0]
lsls r0, r1, 2
@ -2888,7 +2888,7 @@ _080365B4:
.4byte _0803661C
.4byte _08036624
_080365D8:
ldr r2, =gUnknown_0831ABA8
ldr r2, =gBattleTerrainTable
ldr r0, =gBattleTerrain
ldrb r1, [r0]
lsls r0, r1, 2
@ -3003,7 +3003,7 @@ _080366C8:
.4byte _08036738
.4byte _08036740
_080366EC:
ldr r2, =gUnknown_0831ABA8
ldr r2, =gBattleTerrainTable
ldr r0, =gBattleTerrain
ldrb r1, [r0]
lsls r0, r1, 2

View File

@ -3365,7 +3365,7 @@ _0805EDE4:
adds r4, r1, 0
cmp r0, 0
beq _0805EE06
ldr r0, =gUnknown_08305DCC
ldr r0, =gEnemyMonElevation
ldrh r1, [r3, 0x2]
adds r1, r0
ldrb r0, [r1]
@ -3441,7 +3441,7 @@ SetBankEnemyShadowSpriteCallback: @ 805EE54
beq _0805EE7E
adds r5, r0, 0
_0805EE7E:
ldr r0, =gUnknown_08305DCC
ldr r0, =gEnemyMonElevation
adds r0, r5, r0
ldrb r0, [r0]
cmp r0, 0

View File

@ -4283,7 +4283,7 @@ _0806694C:
bl sub_806A12C
ldr r6, =gUnknown_0202499C
mov r9, r7
ldr r1, =gUnknown_083054E0
ldr r1, =gTrainerFrontPicCoords
mov r2, r8
lsls r0, r2, 2
adds r0, r1
@ -4411,7 +4411,7 @@ _08066A76:
mov r0, r8
bl sub_806A12C
ldr r0, =gUnknown_0202499C
ldr r2, =gUnknown_083054E0
ldr r2, =gTrainerFrontPicCoords
mov r3, r8
lsls r1, r3, 2
adds r1, r2

View File

@ -4339,7 +4339,7 @@ _080617CA:
bl sub_806A12C
ldr r6, =gUnknown_0202499C
mov r9, r7
ldr r1, =gUnknown_083054E0
ldr r1, =gTrainerFrontPicCoords
mov r2, r8
lsls r0, r2, 2
adds r0, r1
@ -4564,7 +4564,7 @@ _080619DE:
mov r0, r8
bl sub_806A12C
ldr r0, =gUnknown_0202499C
ldr r2, =gUnknown_083054E0
ldr r2, =gTrainerFrontPicCoords
mov r3, r8
lsls r1, r3, 2
adds r1, r2

View File

@ -4401,7 +4401,7 @@ sub_8059B3C: @ 8059B3C
ldrb r0, [r0]
cmp r0, 0x1
beq _08059B98
bl sub_814FBAC
bl SetPpNumbersPaletteInMoveSelection
ldrb r1, [r7]
lsls r4, r1, 9
adds r0, r5, 0x4
@ -7371,7 +7371,7 @@ _0805B5E0:
beq _0805B618
movs r0, 0x5A
mov r9, r0
ldr r1, =gUnknown_083054E0
ldr r1, =gTrainerFrontPicCoords
b _0805B642
.pool
_0805B618:

View File

@ -4193,7 +4193,7 @@ _081BD3A8:
lsrs r4, r0, 24
movs r0, 0x20
mov r9, r0
ldr r1, =gUnknown_083054E0
ldr r1, =gTrainerFrontPicCoords
lsls r0, r4, 2
adds r0, r1
ldrb r1, [r0]

View File

@ -4096,7 +4096,7 @@ _0818892C:
bl sub_806A12C
ldr r6, =gUnknown_0202499C
mov r9, r7
ldr r1, =gUnknown_083054E0
ldr r1, =gTrainerFrontPicCoords
mov r2, r8
lsls r0, r2, 2
adds r0, r1

View File

@ -4033,7 +4033,7 @@ _0818BD72:
beq _0818BD9C
movs r0, 0x5A
mov r9, r0
ldr r1, =gUnknown_083054E0
ldr r1, =gTrainerFrontPicCoords
b _0818BD9E
.pool
_0818BD98:

View File

@ -20577,7 +20577,7 @@ _081A5328:
movs r0, 0x1
negs r0, r0
strb r0, [r1, 0x1]
ldr r0, =gText_JapaneseHonorific
ldr r0, =gText_PlayerMon1Name
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r4, =gDisplayedStringBattle
adds r0, r4, 0
@ -20586,7 +20586,7 @@ _081A5328:
ldr r0, =gText_Vs
movs r1, 0x10
bl sub_814F9EC
ldr r0, =gText_RivalBuffer
ldr r0, =gText_OpponentMon1Name
bl BattleStringExpandPlaceholdersToDisplayedString
adds r0, r4, 0
movs r1, 0x11

View File

@ -665,7 +665,7 @@ _0817D16C:
bl _0817DFAC
.pool
_0817D1B8:
ldr r1, =gUnknown_02022F5C
ldr r1, =gBattleTextBuff1 + 4
ldrb r0, [r1]
cmp r0, 0
beq _0817D1C4
@ -917,7 +917,7 @@ _0817D3C0:
bne _0817D3CC
bl _0817E0A6
_0817D3CC:
ldr r1, =gUnknown_02022F6A
ldr r1, =gBattleTextBuff2 + 2
ldrh r0, [r1]
cmp r0, 0xD1
bne _0817D3E8
@ -946,7 +946,7 @@ _0817D3FE:
ldrb r1, [r1]
cmp r0, r1
bne _0817D436
ldr r1, =gUnknown_02022F6A
ldr r1, =gBattleTextBuff2 + 2
ldrh r0, [r1]
cmp r0, 0xD1
bne _0817D42C
@ -988,7 +988,7 @@ _0817D45C:
bne _0817D468
bl _0817E0A6
_0817D468:
ldr r1, =gUnknown_02022F6A
ldr r1, =gBattleTextBuff2 + 2
ldrh r0, [r1]
cmp r0, 0xD3
bne _0817D484
@ -2182,7 +2182,7 @@ _0817DE10:
b _0817DFAA
.pool
_0817DE58:
ldr r1, =gUnknown_02022F5A
ldr r1, =gBattleTextBuff1 + 2
ldrh r0, [r1]
cmp r0, 0x73
bne _0817DE82
@ -2204,7 +2204,7 @@ _0817DE58:
ands r0, r2
strb r0, [r1]
_0817DE82:
ldr r2, =gUnknown_02022F5A
ldr r2, =gBattleTextBuff1 + 2
ldrh r0, [r2]
cmp r0, 0x71
bne _0817DEAA
@ -2225,7 +2225,7 @@ _0817DE82:
ands r0, r2
strb r0, [r1]
_0817DEAA:
ldr r1, =gUnknown_02022F5A
ldr r1, =gBattleTextBuff1 + 2
ldrh r0, [r1]
cmp r0, 0x36
beq _0817DEB4

File diff suppressed because it is too large Load Diff

View File

@ -2617,8 +2617,8 @@ _080B1C96:
.pool
thumb_func_end sub_80B1C7C
thumb_func_start sub_80B1CA4
sub_80B1CA4: @ 80B1CA4
thumb_func_start GetTrainer1LoseText
GetTrainer1LoseText: @ 80B1CA4
push {r4,lr}
ldr r0, =gTrainerBattleOpponent_A
ldrh r1, [r0]
@ -2643,10 +2643,10 @@ _080B1CC0:
pop {r1}
bx r1
.pool
thumb_func_end sub_80B1CA4
thumb_func_end GetTrainer1LoseText
thumb_func_start sub_80B1CE0
sub_80B1CE0: @ 80B1CE0
thumb_func_start GetTrainer2LoseText
GetTrainer2LoseText: @ 80B1CE0
push {r4,lr}
ldr r4, =gStringVar4
ldr r0, =gUnknown_02038BE0
@ -2660,7 +2660,7 @@ sub_80B1CE0: @ 80B1CE0
pop {r1}
bx r1
.pool
thumb_func_end sub_80B1CE0
thumb_func_end GetTrainer2LoseText
thumb_func_start sub_80B1D04
sub_80B1D04: @ 80B1D04

View File

@ -5857,8 +5857,8 @@ sub_8165244: @ 8165244
.pool
thumb_func_end sub_8165244
thumb_func_start sub_8165264
sub_8165264: @ 8165264
thumb_func_start GetEreaderTrainerClassId
GetEreaderTrainerClassId: @ 8165264
ldr r1, =gTrainerClassToNameIndex
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
@ -5869,10 +5869,10 @@ sub_8165264: @ 8165264
ldrb r0, [r0]
bx lr
.pool
thumb_func_end sub_8165264
thumb_func_end GetEreaderTrainerClassId
thumb_func_start sub_8165284
sub_8165284: @ 8165284
thumb_func_start GetEreaderTrainerName
GetEreaderTrainerName: @ 8165284
push {r4,lr}
adds r3, r0, 0
movs r2, 0
@ -5896,7 +5896,7 @@ _08165294:
pop {r0}
bx r0
.pool
thumb_func_end sub_8165284
thumb_func_end GetEreaderTrainerName
thumb_func_start sub_81652B4
sub_81652B4: @ 81652B4

View File

@ -1,328 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start oei_exclamation_mark
oei_exclamation_mark: @ 80B4620
push {lr}
ldr r0, =gUnknown_085507B4
movs r1, 0
movs r2, 0
movs r3, 0x53
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
beq _080B4648
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gSprites
adds r0, r1
movs r1, 0
movs r2, 0
bl sub_80B46D8
_080B4648:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end oei_exclamation_mark
thumb_func_start sub_80B4658
sub_80B4658: @ 80B4658
push {lr}
ldr r0, =gUnknown_085507B4
movs r1, 0
movs r2, 0
movs r3, 0x52
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
beq _080B4680
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gSprites
adds r0, r1
movs r1, 0x21
movs r2, 0x1
bl sub_80B46D8
_080B4680:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_80B4658
thumb_func_start sub_80B4690
sub_80B4690: @ 80B4690
push {r4,lr}
ldr r0, =gUnknown_085507CC
movs r1, 0
movs r2, 0
movs r3, 0x52
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
beq _080B46C6
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gSprites
adds r4, r0
adds r0, r4, 0
movs r1, 0x2E
movs r2, 0
bl sub_80B46D8
ldrb r1, [r4, 0x5]
movs r0, 0xF
ands r0, r1
movs r1, 0x20
orrs r0, r1
strb r0, [r4, 0x5]
_080B46C6:
movs r0, 0
pop {r4}
pop {r1}
bx r1
.pool
thumb_func_end sub_80B4690
thumb_func_start sub_80B46D8
@ void sub_80B46D8(struct obj *object, s16 a2, u8 a3)
sub_80B46D8: @ 80B46D8
push {r4,lr}
lsls r2, 24
lsrs r2, 24
ldrb r4, [r0, 0x5]
movs r3, 0xD
negs r3, r3
ands r3, r4
movs r4, 0x4
orrs r3, r4
strb r3, [r0, 0x5]
movs r3, 0x3E
adds r3, r0
mov r12, r3
ldrb r3, [r3]
movs r4, 0x2
orrs r3, r4
mov r4, r12
strb r3, [r4]
ldr r4, =gFieldEffectSpawnParams
ldr r3, [r4]
strh r3, [r0, 0x2E]
ldr r3, [r4, 0x4]
strh r3, [r0, 0x30]
ldr r3, [r4, 0x8]
strh r3, [r0, 0x32]
ldr r3, =0x0000fffb
strh r3, [r0, 0x34]
strh r1, [r0, 0x3C]
adds r1, r2, 0
bl StartSpriteAnim
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_80B46D8
thumb_func_start objc_exclamation_mark_probably
objc_exclamation_mark_probably: @ 80B4724
push {r4,lr}
sub sp, 0x4
adds r4, r0, 0
ldrh r0, [r4, 0x2E]
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x30]
lsls r1, 24
lsrs r1, 24
ldrh r2, [r4, 0x32]
lsls r2, 24
lsrs r2, 24
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _080B4756
adds r0, r4, 0
adds r0, 0x3F
ldrb r1, [r0]
movs r0, 0x10
ands r0, r1
cmp r0, 0
beq _080B4764
_080B4756:
ldrh r1, [r4, 0x3C]
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl FieldEffectStop
b _080B47B2
_080B4764:
ldr r2, =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
adds r0, r2
ldrb r0, [r0, 0x4]
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gSprites
adds r1, r0
ldrh r3, [r4, 0x34]
ldrh r0, [r4, 0x36]
adds r2, r3, r0
strh r2, [r4, 0x36]
ldrh r0, [r1, 0x20]
strh r0, [r4, 0x20]
ldrh r0, [r1, 0x22]
subs r0, 0x10
strh r0, [r4, 0x22]
ldrh r0, [r1, 0x24]
strh r0, [r4, 0x24]
ldrh r0, [r1, 0x26]
adds r0, r2
strh r0, [r4, 0x26]
lsls r2, 16
asrs r2, 16
cmp r2, 0
beq _080B47B0
adds r0, r3, 0x1
strh r0, [r4, 0x34]
b _080B47B2
.pool
_080B47B0:
strh r2, [r4, 0x34]
_080B47B2:
add sp, 0x4
pop {r4}
pop {r0}
bx r0
thumb_func_end objc_exclamation_mark_probably
thumb_func_start sub_80B47BC
sub_80B47BC: @ 80B47BC
push {lr}
ldr r0, =gUnknown_02038BFC
ldrb r0, [r0]
cmp r0, 0
beq _080B47D4
ldr r0, =gUnknown_03006090
ldrb r0, [r0, 0xC]
b _080B47D8
.pool
_080B47D4:
ldr r0, =gUnknown_03006090
ldrb r0, [r0]
_080B47D8:
pop {r1}
bx r1
.pool
thumb_func_end sub_80B47BC
thumb_func_start sub_80B47E0
sub_80B47E0: @ 80B47E0
push {lr}
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bls _080B47EE
movs r0, 0
b _080B4800
_080B47EE:
cmp r0, 0
beq _080B47FC
ldr r0, =gUnknown_03006090
ldrb r0, [r0, 0xC]
b _080B4800
.pool
_080B47FC:
ldr r0, =gUnknown_03006090
ldrb r0, [r0]
_080B4800:
pop {r1}
bx r1
.pool
thumb_func_end sub_80B47E0
thumb_func_start sub_80B4808
sub_80B4808: @ 80B4808
push {lr}
ldr r0, =gUnknown_030060AC
ldrb r0, [r0]
cmp r0, 0x1
bne _080B4870
ldr r2, =gUnknown_03006090
ldr r0, =gUnknown_03006080
ldrh r1, [r0]
lsls r0, r1, 1
adds r0, r1
lsls r0, 2
adds r0, r2
ldrb r1, [r0]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
adds r0, r1
ldrb r0, [r0, 0x18]
lsls r0, 28
lsrs r0, 28
bl GetOppositeDirection
lsls r0, 24
lsrs r0, 24
bl GetFaceDirectionAnimId
ldr r3, =gUnknown_03006084
strb r0, [r3]
movs r0, 0xFE
strb r0, [r3, 0x1]
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
movs r0, 0xFF
bl exec_movement
b _080B489E
.pool
_080B4870:
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
adds r0, r1
ldrb r0, [r0, 0x18]
lsls r0, 28
lsrs r0, 28
bl GetFaceDirectionAnimId
ldr r3, =gUnknown_03006084
strb r0, [r3]
movs r0, 0xFE
strb r0, [r3, 0x1]
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
movs r0, 0xFF
bl exec_movement
_080B489E:
movs r0, 0xFF
bl sub_809BE48
pop {r0}
bx r0
.pool
thumb_func_end sub_80B4808
.align 2, 0 @ Don't pad with nop.

View File

@ -119,11 +119,11 @@ InitMainMenu: @ 802F6F4
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
bl ResetPaletteFade
ldr r0, =gUnknown_082FF0A0
ldr r0, =gMainMenuBgPal
movs r1, 0
movs r2, 0x20
bl LoadPalette
ldr r0, =gUnknown_082FF0C0
ldr r0, =gMainMenuTextPal
movs r1, 0xF0
movs r2, 0x20
bl LoadPalette
@ -1914,7 +1914,7 @@ task_new_game_prof_birch_speech_1: @ 80307B0
movs r0, 0x54
movs r1, 0
bl SetGpuReg
ldr r0, =gUnknown_082FED3C
ldr r0, =gBirchIntroShadowGfx
movs r1, 0xC0
lsls r1, 19
bl LZ77UnCompVram
@ -3679,7 +3679,7 @@ new_game_prof_birch_speech_part2_start: @ 8031678
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
bl ResetPaletteFade
ldr r0, =gUnknown_082FED3C
ldr r0, =gBirchIntroShadowGfx
adds r1, r4, 0
bl LZ77UnCompVram
ldr r0, =gUnknown_082FEEF0
@ -3689,7 +3689,7 @@ new_game_prof_birch_speech_part2_start: @ 8031678
movs r1, 0
movs r2, 0x40
bl LoadPalette
ldr r0, =gUnknown_082FF01A
ldr r0, =gUnknown_082FF018+2
movs r1, 0x1
movs r2, 0x10
bl LoadPalette
@ -4459,11 +4459,11 @@ set_default_player_name: @ 8031DC4
adds r5, r1, 0
cmp r0, 0
bne _08031DE4
ldr r1, =gUnknown_082FF128
ldr r1, =gMalePresetNames
b _08031DE6
.pool
_08031DE4:
ldr r1, =gUnknown_082FF178
ldr r1, =gFemalePresetNames
_08031DE6:
lsls r0, r2, 2
adds r0, r1

View File

@ -7571,7 +7571,7 @@ sub_81C3B08: @ 81C3B08
adds r7, r4, 0
ldrb r0, [r5]
adds r1, r6, 0
bl sub_814FC20
bl GetCurrentPpToMaxPpState
lsls r0, 24
lsrs r0, 24
adds r5, r0, 0

View File

@ -291,7 +291,7 @@ sub_809EB04: @ 809EB04
lsrs r5, 24
ldr r0, =gUnknown_085104C4
bl LoadSpritePalette
ldr r0, =gUnknown_085104F0
ldr r0, =gSpriteTemplate_85104F0
mov r8, r0
movs r1, 0x35
movs r2, 0x44
@ -655,7 +655,7 @@ sub_809EDE8: @ 809EDE8
lsls r0, r4, 1
adds r0, r4
lsls r0, 2
ldr r1, =gUnknown_0851041C
ldr r1, =gUnknown_08510420 - 0x4
adds r2, r0, r1
ldr r1, =gMain
ldrh r3, [r1, 0x2E]

View File

@ -7347,7 +7347,7 @@ sub_8139228: @ 8139228
sub_8139238: @ 8139238
push {lr}
ldr r0, =gStringVar1
bl sub_8165284
bl GetEreaderTrainerName
pop {r0}
bx r0
.pool

View File

@ -419,11 +419,11 @@ _080A5FE8:
lsls r0, 1
cmp r4, r0
bls _080A5FF8
ldr r0, =gUnknown_08305DCC
ldr r0, =gEnemyMonElevation
b _080A5FFC
.pool
_080A5FF8:
ldr r0, =gUnknown_08305DCC
ldr r0, =gEnemyMonElevation
adds r0, r7, r0
_080A5FFC:
ldrb r5, [r0]

View File

@ -267,7 +267,7 @@ CheckIfTrainerCanApproachPlayer: @ 80B3DF0
mov r8, r4
cmp r0, 0x1
bne _080B3E50
ldr r1, =gUnknown_0855072C
ldr r1, =gIsTrainerInRange
ldrb r0, [r7, 0x18]
lsls r0, 28
lsrs r0, 26
@ -300,7 +300,7 @@ _080B3E4C:
_080B3E50:
movs r5, 0
_080B3E52:
ldr r0, =gUnknown_0855072C
ldr r0, =gIsTrainerInRange
lsls r4, r5, 2
adds r4, r0
ldrb r1, [r7, 0x1D]
@ -702,7 +702,7 @@ c3_8081EDC: @ 80B4118
b _080B416C
.pool
_080B4150:
ldr r7, =gUnknown_0855073C
ldr r7, =gTrainerSeeFuncList
_080B4152:
movs r1, 0x8
ldrsh r0, [r4, r1]
@ -1186,7 +1186,7 @@ sub_80B44C8: @ 80B44C8
adds r0, 0x1
strh r0, [r4, 0x16]
_080B44FA:
ldr r1, =gUnknown_0855076C
ldr r1, =gTrainerSeeFuncList2
movs r2, 0x8
ldrsh r0, [r4, r2]
lsls r0, 2
@ -1322,4 +1322,324 @@ _080B4616:
.pool
thumb_func_end sub_80B45D0
thumb_func_start oei_exclamation_mark
oei_exclamation_mark: @ 80B4620
push {lr}
ldr r0, =gSpriteTemplate_85507B4
movs r1, 0
movs r2, 0
movs r3, 0x53
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
beq _080B4648
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gSprites
adds r0, r1
movs r1, 0
movs r2, 0
bl sub_80B46D8
_080B4648:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end oei_exclamation_mark
thumb_func_start sub_80B4658
sub_80B4658: @ 80B4658
push {lr}
ldr r0, =gSpriteTemplate_85507B4
movs r1, 0
movs r2, 0
movs r3, 0x52
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
beq _080B4680
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gSprites
adds r0, r1
movs r1, 0x21
movs r2, 0x1
bl sub_80B46D8
_080B4680:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_80B4658
thumb_func_start sub_80B4690
sub_80B4690: @ 80B4690
push {r4,lr}
ldr r0, =gSpriteTemplate_85507CC
movs r1, 0
movs r2, 0
movs r3, 0x52
bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
beq _080B46C6
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
ldr r0, =gSprites
adds r4, r0
adds r0, r4, 0
movs r1, 0x2E
movs r2, 0
bl sub_80B46D8
ldrb r1, [r4, 0x5]
movs r0, 0xF
ands r0, r1
movs r1, 0x20
orrs r0, r1
strb r0, [r4, 0x5]
_080B46C6:
movs r0, 0
pop {r4}
pop {r1}
bx r1
.pool
thumb_func_end sub_80B4690
thumb_func_start sub_80B46D8
@ void sub_80B46D8(struct obj *object, s16 a2, u8 a3)
sub_80B46D8: @ 80B46D8
push {r4,lr}
lsls r2, 24
lsrs r2, 24
ldrb r4, [r0, 0x5]
movs r3, 0xD
negs r3, r3
ands r3, r4
movs r4, 0x4
orrs r3, r4
strb r3, [r0, 0x5]
movs r3, 0x3E
adds r3, r0
mov r12, r3
ldrb r3, [r3]
movs r4, 0x2
orrs r3, r4
mov r4, r12
strb r3, [r4]
ldr r4, =gFieldEffectSpawnParams
ldr r3, [r4]
strh r3, [r0, 0x2E]
ldr r3, [r4, 0x4]
strh r3, [r0, 0x30]
ldr r3, [r4, 0x8]
strh r3, [r0, 0x32]
ldr r3, =0x0000fffb
strh r3, [r0, 0x34]
strh r1, [r0, 0x3C]
adds r1, r2, 0
bl StartSpriteAnim
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_80B46D8
thumb_func_start objc_exclamation_mark_probably
objc_exclamation_mark_probably: @ 80B4724
push {r4,lr}
sub sp, 0x4
adds r4, r0, 0
ldrh r0, [r4, 0x2E]
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x30]
lsls r1, 24
lsrs r1, 24
ldrh r2, [r4, 0x32]
lsls r2, 24
lsrs r2, 24
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _080B4756
adds r0, r4, 0
adds r0, 0x3F
ldrb r1, [r0]
movs r0, 0x10
ands r0, r1
cmp r0, 0
beq _080B4764
_080B4756:
ldrh r1, [r4, 0x3C]
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl FieldEffectStop
b _080B47B2
_080B4764:
ldr r2, =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
adds r0, r2
ldrb r0, [r0, 0x4]
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gSprites
adds r1, r0
ldrh r3, [r4, 0x34]
ldrh r0, [r4, 0x36]
adds r2, r3, r0
strh r2, [r4, 0x36]
ldrh r0, [r1, 0x20]
strh r0, [r4, 0x20]
ldrh r0, [r1, 0x22]
subs r0, 0x10
strh r0, [r4, 0x22]
ldrh r0, [r1, 0x24]
strh r0, [r4, 0x24]
ldrh r0, [r1, 0x26]
adds r0, r2
strh r0, [r4, 0x26]
lsls r2, 16
asrs r2, 16
cmp r2, 0
beq _080B47B0
adds r0, r3, 0x1
strh r0, [r4, 0x34]
b _080B47B2
.pool
_080B47B0:
strh r2, [r4, 0x34]
_080B47B2:
add sp, 0x4
pop {r4}
pop {r0}
bx r0
thumb_func_end objc_exclamation_mark_probably
thumb_func_start sub_80B47BC
sub_80B47BC: @ 80B47BC
push {lr}
ldr r0, =gUnknown_02038BFC
ldrb r0, [r0]
cmp r0, 0
beq _080B47D4
ldr r0, =gUnknown_03006090
ldrb r0, [r0, 0xC]
b _080B47D8
.pool
_080B47D4:
ldr r0, =gUnknown_03006090
ldrb r0, [r0]
_080B47D8:
pop {r1}
bx r1
.pool
thumb_func_end sub_80B47BC
thumb_func_start sub_80B47E0
sub_80B47E0: @ 80B47E0
push {lr}
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bls _080B47EE
movs r0, 0
b _080B4800
_080B47EE:
cmp r0, 0
beq _080B47FC
ldr r0, =gUnknown_03006090
ldrb r0, [r0, 0xC]
b _080B4800
.pool
_080B47FC:
ldr r0, =gUnknown_03006090
ldrb r0, [r0]
_080B4800:
pop {r1}
bx r1
.pool
thumb_func_end sub_80B47E0
thumb_func_start sub_80B4808
sub_80B4808: @ 80B4808
push {lr}
ldr r0, =gUnknown_030060AC
ldrb r0, [r0]
cmp r0, 0x1
bne _080B4870
ldr r2, =gUnknown_03006090
ldr r0, =gUnknown_03006080
ldrh r1, [r0]
lsls r0, r1, 1
adds r0, r1
lsls r0, 2
adds r0, r2
ldrb r1, [r0]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
adds r0, r1
ldrb r0, [r0, 0x18]
lsls r0, 28
lsrs r0, 28
bl GetOppositeDirection
lsls r0, 24
lsrs r0, 24
bl GetFaceDirectionAnimId
ldr r3, =gUnknown_03006084
strb r0, [r3]
movs r0, 0xFE
strb r0, [r3, 0x1]
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
movs r0, 0xFF
bl exec_movement
b _080B489E
.pool
_080B4870:
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
adds r0, r1
ldrb r0, [r0, 0x18]
lsls r0, 28
lsrs r0, 28
bl GetFaceDirectionAnimId
ldr r3, =gUnknown_03006084
strb r0, [r3]
movs r0, 0xFE
strb r0, [r3, 0x1]
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
movs r0, 0xFF
bl exec_movement
_080B489E:
movs r0, 0xFF
bl sub_809BE48
pop {r0}
bx r0
.pool
thumb_func_end sub_80B4808
.align 2, 0 @ Don't pad with nop.

View File

@ -355,12 +355,12 @@ B_LINK_OPPONENT_MON1_NAME = FD 0A
B_LINK_PLAYER_MON2_NAME = FD 0B
B_LINK_OPPONENT_MON2_NAME = FD 0C
B_ATK_NAME_WITH_PREFIX_MON1 = FD 0D
B_ATK_NAME = FD 0E
B_ATK_PARTNER_NAME = FD 0E
B_ATK_NAME_WITH_PREFIX = FD 0F
B_DEF_NAME_WITH_PREFIX = FD 10
B_EFF_NAME_WITH_PREFIX = FD 11 @ EFF = short for gEffectBank
B_SCR_ACTIVE_NAME_WITH_PREFIX = FD 12
B_ACTIVE_NAME_WITH_PREFIX = FD 13
B_ACTIVE_NAME_WITH_PREFIX = FD 12
B_SCR_ACTIVE_NAME_WITH_PREFIX = FD 13
B_CURRENT_MOVE = FD 14
B_LAST_MOVE = FD 15
B_LAST_ITEM = FD 16

12
data/battle_1.s Normal file
View File

@ -0,0 +1,12 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_082FF1C8:: @ 82FF1C8
.byte 0x01, 0x04, 0x10, 0x40
.byte 0x02, 0x04, 0x08, 0x20
.byte 0x02, 0x04, 0x08, 0x20
.byte 0x00, 0x00, 0x00, 0x00

View File

@ -4,6 +4,8 @@
.section .rodata
.align 2, 0
@ only partially done because this file terrifies me
gUnknown_08524904:: @ 8524904
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
@ -291,62 +293,740 @@ gUnknown_08524B34:: @ 8524B34
gUnknown_08524B3C:: @ 8524B3C
.byte 0x00, 0x87, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B44:: @ 8524B44
.incbin "baserom.gba", 0x524b44, 0x1d0
obj_tiles 0x08c02538, 0x0200, 0x2710
obj_tiles 0x08c1c6e0, 0x0300, 0x2711
obj_tiles 0x08c20784, 0x0200, 0x2712
obj_tiles 0x08c025e8, 0x0100, 0x2713
obj_tiles 0x08c0265c, 0x0200, 0x2714
obj_tiles 0x08c0270c, 0x0400, 0x2715
obj_tiles 0x08c027e0, 0x0180, 0x2716
obj_tiles 0x08c029cc, 0x0800, 0x2717
obj_tiles 0x08c02b68, 0x0020, 0x2718
obj_tiles 0x08c02fa4, 0x0400, 0x2719
obj_tiles 0x08c02bc4, 0x1200, 0x271a
obj_tiles 0x08c032ac, 0x0180, 0x271b
obj_tiles 0x08c0334c, 0x0080, 0x271c
obj_tiles 0x08c03438, 0x0080, 0x271d
obj_tiles 0x08c1fbd4, 0x0280, 0x271e
obj_tiles 0x08c03484, 0x0080, 0x271f
obj_tiles 0x08c03518, 0x0100, 0x2720
obj_tiles 0x08c03598, 0x0020, 0x2721
obj_tiles 0x08c24d7c, 0x0080, 0x2722
obj_tiles 0x08c035f8, 0x0400, 0x2723
obj_tiles 0x08c036b8, 0x0200, 0x2724
obj_tiles 0x08c03a28, 0x0a00, 0x2725
obj_tiles 0x08c03a28, 0x0a00, 0x2726
obj_tiles 0x08c037d4, 0x0380, 0x2727
obj_tiles 0x08c03ea0, 0x0300, 0x2728
obj_tiles 0x08c03db0, 0x0a00, 0x2729
obj_tiles 0x08c04494, 0x0a00, 0x272a
obj_tiles 0x08c0481c, 0x0a00, 0x272b
obj_tiles 0x08c04b40, 0x0a00, 0x272c
obj_tiles 0x08c04e90, 0x0a00, 0x272d
obj_tiles 0x08c05170, 0x0a00, 0x272e
obj_tiles 0x08c03f80, 0x0e00, 0x272f
obj_tiles 0x08c043a8, 0x0380, 0x2730
obj_tiles 0x08c0557c, 0x1000, 0x2731
obj_tiles 0x08c05eec, 0x0800, 0x2732
obj_tiles 0x08c062b8, 0x0a00, 0x2733
obj_tiles 0x08c06678, 0x0800, 0x2734
obj_tiles 0x08c06a4c, 0x0a00, 0x2735
obj_tiles 0x08c07964, 0x0a00, 0x2736
obj_tiles 0x08c07b88, 0x0a00, 0x2737
obj_tiles 0x08c07e84, 0x0a00, 0x2738
obj_tiles 0x08c08090, 0x0a00, 0x2739
obj_tiles 0x08c082c4, 0x0a00, 0x273a
obj_tiles 0x08c085bc, 0x0a00, 0x273b
obj_tiles 0x08c08a0c, 0x0a00, 0x273c
obj_tiles 0x08c08ca0, 0x0a00, 0x273d
obj_tiles 0x08c09604, 0x1000, 0x273e
obj_tiles 0x08c09604, 0x1000, 0x273f
obj_tiles 0x08c09cf0, 0x1000, 0x2740
obj_tiles 0x08c09cf0, 0x1000, 0x2741
obj_tiles 0x08c09ffc, 0x0200, 0x2742
obj_tiles 0x08c0a09c, 0x0200, 0x2743
obj_tiles 0x08c0a148, 0x0200, 0x2744
obj_tiles 0x08c2e830, 0x0800, 0x2745
obj_tiles 0x08c0a3a8, 0x0080, 0x2746
obj_tiles 0x08c0a8bc, 0x0200, 0x2747
obj_tiles 0x08c0a3ec, 0x1000, 0x2748
obj_tiles 0x08c0a980, 0x0180, 0x2749
.align 2
gUnknown_08524D14:: @ 8524D14
.incbin "baserom.gba", 0x524d14, 0x270
obj_tiles 0x08c0aa2c, 0x0c00, 0x274a
obj_tiles 0x08c0aebc, 0x0100, 0x274b
obj_tiles 0x08c0af38, 0x0040, 0x274c
obj_tiles 0x08c0af7c, 0x0180, 0x274d
obj_tiles 0x08c0b04c, 0x0800, 0x274e
obj_tiles 0x08c0b444, 0x0480, 0x274f
obj_tiles 0x08c23104, 0x0200, 0x2750
obj_tiles 0x08c0b6bc, 0x0200, 0x2751
obj_tiles 0x08c0b7f0, 0x0100, 0x2752
obj_tiles 0x08c0b6bc, 0x0200, 0x2753
obj_tiles 0x08c0b6bc, 0x0200, 0x2754
obj_tiles 0x08c0b6bc, 0x0200, 0x2755
obj_tiles 0x08c0b864, 0x0200, 0x2756
obj_tiles 0x08c0b90c, 0x0a00, 0x2757
obj_tiles 0x08c0bb38, 0x0300, 0x2758
obj_tiles 0x08c0bc20, 0x0180, 0x2759
obj_tiles 0x08c1b29c, 0x00a0, 0x275a
obj_tiles 0x08c0bd5c, 0x0700, 0x275b
obj_tiles 0x08c14cec, 0x0400, 0x275c
obj_tiles 0x08c14f50, 0x0200, 0x275d
obj_tiles 0x08c0bffc, 0x0300, 0x275e
obj_tiles 0x08c0c1bc, 0x0c00, 0x275f
obj_tiles 0x08c0c5ec, 0x0a00, 0x2760
obj_tiles 0x08c0c974, 0x0080, 0x2761
obj_tiles 0x08c0cb90, 0x0040, 0x2762
obj_tiles 0x08c0ce18, 0x0e00, 0x2763
obj_tiles 0x08c0d2bc, 0x0e00, 0x2764
obj_tiles 0x08c0d680, 0x0280, 0x2765
obj_tiles 0x08c0d738, 0x0200, 0x2766
obj_tiles 0x08c24cfc, 0x0080, 0x2767
obj_tiles 0x08c0d8a8, 0x00c0, 0x2768
obj_tiles 0x08c0d8f8, 0x0a00, 0x2769
obj_tiles 0x08c0db6c, 0x0200, 0x276a
obj_tiles 0x08c0dbfc, 0x0180, 0x276b
obj_tiles 0x08c0dd30, 0x0080, 0x276c
obj_tiles 0x08c0ddac, 0x1000, 0x276d
obj_tiles 0x08c0e47c, 0x0a00, 0x276e
obj_tiles 0x08c0e620, 0x0180, 0x276f
obj_tiles 0x08c0e6d0, 0x0380, 0x2770
obj_tiles 0x08c0e840, 0x0c00, 0x2771
obj_tiles 0x08c0ea20, 0x0200, 0x2772
obj_tiles 0x08c27cec, 0x0200, 0x2773
obj_tiles 0x08c0eb58, 0x0200, 0x2774
obj_tiles 0x08c0ec58, 0x0200, 0x2775
obj_tiles 0x08c0ed88, 0x0400, 0x2776
obj_tiles 0x08c0ef20, 0x0080, 0x2777
obj_tiles 0x08c0ef8c, 0x0400, 0x2778
obj_tiles 0x08c0f174, 0x0c00, 0x2779
obj_tiles 0x08c0f720, 0x0200, 0x277a
obj_tiles 0x08c0f810, 0x1000, 0x277b
obj_tiles 0x08c0fbe4, 0x0a00, 0x277c
obj_tiles 0x08c0ff68, 0x0020, 0x277d
obj_tiles 0x08c0ffb8, 0x0e00, 0x277e
obj_tiles 0x08c1039c, 0x0080, 0x277f
obj_tiles 0x08c10404, 0x0a00, 0x2780
obj_tiles 0x08c10754, 0x0400, 0x2781
obj_tiles 0x08c109e8, 0x0200, 0x2782
obj_tiles 0x08c115e4, 0x0700, 0x2783
obj_tiles 0x08c12e88, 0x0800, 0x2784
obj_tiles 0x08c1315c, 0x0a00, 0x2785
obj_tiles 0x08c133b4, 0x0600, 0x2786
obj_tiles 0x08c13568, 0x0800, 0x2787
obj_tiles 0x08c13820, 0x0200, 0x2788
obj_tiles 0x08c1393c, 0x0040, 0x2789
obj_tiles 0x08c1398c, 0x0180, 0x278a
obj_tiles 0x08c13aa4, 0x0600, 0x278b
obj_tiles 0x08c13be0, 0x0600, 0x278c
obj_tiles 0x08c13ea0, 0x0200, 0x278d
obj_tiles 0x08c13fb4, 0x0080, 0x278e
obj_tiles 0x08c1403c, 0x0200, 0x278f
obj_tiles 0x08c14200, 0x0800, 0x2790
obj_tiles 0x08c1448c, 0x0080, 0x2791
obj_tiles 0x08c144f0, 0x0a00, 0x2792
obj_tiles 0x08c148e8, 0x0280, 0x2793
obj_tiles 0x08c14a58, 0x0280, 0x2794
obj_tiles 0x08c14b78, 0x0100, 0x2795
obj_tiles 0x08c14c1c, 0x0200, 0x2796
obj_tiles 0x08c1a3a0, 0x0200, 0x2797
.align 2
gUnknown_08524F84:: @ 8524F84
.incbin "baserom.gba", 0x524f84, 0x308
obj_tiles 0x08c1a540, 0x0020, 0x2798
obj_tiles 0x08c1a58c, 0x0a00, 0x2799
obj_tiles 0x08c1ab40, 0x0800, 0x279a
obj_tiles 0x08c1a790, 0x0800, 0x279b
obj_tiles 0x08c1ac8c, 0x00c0, 0x279c
obj_tiles 0x08c1ad2c, 0x01c0, 0x279d
obj_tiles 0x08c1ae54, 0x0100, 0x279e
obj_tiles 0x08c2cbac, 0x0800, 0x279f
obj_tiles 0x08c1bc64, 0x0200, 0x27a0
obj_tiles 0x08c1a9a0, 0x0800, 0x27a1
obj_tiles 0x08c02478, 0x0180, 0x27a2
obj_tiles 0x08c1af6c, 0x0180, 0x27a3
obj_tiles 0x08c1b178, 0x0200, 0x27a4
obj_tiles 0x08c1b0a8, 0x0200, 0x27a5
obj_tiles 0x08c1b328, 0x0180, 0x27a6
obj_tiles 0x08c1b418, 0x0400, 0x27a7
obj_tiles 0x08c033cc, 0x0080, 0x27a8
obj_tiles 0x08c1b510, 0x0100, 0x27a9
obj_tiles 0x08c1b594, 0x0100, 0x27aa
obj_tiles 0x08c1b660, 0x0140, 0x27ab
obj_tiles 0x08c1b748, 0x0800, 0x27ac
obj_tiles 0x08c1b988, 0x0200, 0x27ad
obj_tiles 0x08c1ba04, 0x0100, 0x27ae
obj_tiles 0x08c1baf0, 0x00a0, 0x27af
obj_tiles 0x08c1bb94, 0x0100, 0x27b0
obj_tiles 0x08c0297c, 0x0080, 0x27b1
obj_tiles 0x08c1be40, 0x0300, 0x27b2
obj_tiles 0x08c1bee4, 0x0100, 0x27b3
obj_tiles 0x08c1bee4, 0x0100, 0x27b4
obj_tiles 0x08c1bee4, 0x0100, 0x27b5
obj_tiles 0x08c1bfa4, 0x0800, 0x27b6
obj_tiles 0x08c1bfa4, 0x0800, 0x27b7
obj_tiles 0x08c1bfa4, 0x0800, 0x27b8
obj_tiles 0x08c1bfa4, 0x0800, 0x27b9
obj_tiles 0x08c1bfa4, 0x0800, 0x27ba
obj_tiles 0x08c1c350, 0x0080, 0x27bb
obj_tiles 0x08c1bc64, 0x0200, 0x27bc
obj_tiles 0x08c1c7bc, 0x0200, 0x27bd
obj_tiles 0x08c1d5fc, 0x0200, 0x27be
obj_tiles 0x08c1d6c4, 0x0080, 0x27bf
obj_tiles 0x08c1d750, 0x0200, 0x27c0
obj_tiles 0x08c1d8d0, 0x0500, 0x27c1
obj_tiles 0x08c1d9ac, 0x0800, 0x27c2
obj_tiles 0x08c1db64, 0x0400, 0x27c3
obj_tiles 0x08c1dc40, 0x0020, 0x27c4
obj_tiles 0x08c1dc58, 0x0800, 0x27c5
obj_tiles 0x08c1dfe8, 0x0100, 0x27c6
obj_tiles 0x08c1e0b4, 0x0800, 0x27c7
obj_tiles 0x08c1e354, 0x0400, 0x27c8
obj_tiles 0x08c1e4d0, 0x0a00, 0x27c9
obj_tiles 0x08c1edd8, 0x1000, 0x27ca
obj_tiles 0x08c1ebc8, 0x0800, 0x27cb
obj_tiles 0x08d966c0, 0x0400, 0x27cc
obj_tiles 0x08c20198, 0x0200, 0x27cd
obj_tiles 0x08c1fc84, 0x0800, 0x27ce
obj_tiles 0x08c1ff04, 0x0800, 0x27cf
obj_tiles 0x08c2023c, 0x0800, 0x27d0
obj_tiles 0x08c204e4, 0x0200, 0x27d1
obj_tiles 0x08c20c4c, 0x0800, 0x27d2
obj_tiles 0x08c20fac, 0x0200, 0x27d3
obj_tiles 0x08c20890, 0x0800, 0x27d4
obj_tiles 0x08c21084, 0x0200, 0x27d5
obj_tiles 0x08c2121c, 0x0800, 0x27d6
obj_tiles 0x08c21634, 0x0400, 0x27d7
obj_tiles 0x08c21718, 0x0200, 0x27d8
obj_tiles 0x08c21874, 0x0a80, 0x27d9
obj_tiles 0x08c220a8, 0x0600, 0x27da
obj_tiles 0x08c22234, 0x0800, 0x27db
obj_tiles 0x08c21f0c, 0x0200, 0x27dc
obj_tiles 0x08c226a4, 0x0600, 0x27dd
obj_tiles 0x08c22404, 0x0800, 0x27de
obj_tiles 0x08c228fc, 0x0180, 0x27df
obj_tiles 0x08c229ec, 0x0800, 0x27e0
obj_tiles 0x08c22ddc, 0x0800, 0x27e1
obj_tiles 0x08c23218, 0x0080, 0x27e2
obj_tiles 0x08c242b0, 0x0080, 0x27e3
obj_tiles 0x08c2407c, 0x0800, 0x27e4
obj_tiles 0x08c24300, 0x0800, 0x27e5
obj_tiles 0x08c24590, 0x0600, 0x27e6
obj_tiles 0x08c24820, 0x0600, 0x27e7
obj_tiles 0x08c23218, 0x0080, 0x27e8
obj_tiles 0x08c23ff4, 0x0080, 0x27e9
obj_tiles 0x08c24c50, 0x0180, 0x27ea
obj_tiles 0x08c23218, 0x0080, 0x27eb
obj_tiles 0x08c24dfc, 0x0200, 0x27ec
obj_tiles 0x08c24f48, 0x0400, 0x27ed
obj_tiles 0x08c251ac, 0x0a00, 0x27ee
obj_tiles 0x08c254e0, 0x0800, 0x27ef
obj_tiles 0x08c25794, 0x0200, 0x27f0
obj_tiles 0x08c27764, 0x0400, 0x27f1
obj_tiles 0x08c27a58, 0x0080, 0x27f2
obj_tiles 0x08c27910, 0x0800, 0x27f3
obj_tiles 0x08c25b1c, 0x0200, 0x27f4
obj_tiles 0x08c27b08, 0x0300, 0x27f5
obj_tiles 0x08c258b8, 0x0800, 0x27f6
obj_tiles 0x08c28394, 0x0380, 0x27f7
obj_tiles 0x08c27e34, 0x0800, 0x27f8
.align 2
gUnknown_0852528C:: @ 852528C
.incbin "baserom.gba", 0x52528c, 0x120
obj_tiles 0x08c28564, 0x00c0, 0x27f9
obj_tiles 0x08c28610, 0x0800, 0x27fa
obj_tiles 0x08c28880, 0x0060, 0x27fb
obj_tiles 0x08c28880, 0x0060, 0x27fc
obj_tiles 0x08c28880, 0x0060, 0x27fd
obj_tiles 0x08c287f4, 0x0080, 0x27fe
obj_tiles 0x08c2caa0, 0x0180, 0x27ff
obj_tiles 0x08c2cdf4, 0x0180, 0x2800
obj_tiles 0x08c2d348, 0x0200, 0x2801
obj_tiles 0x08c2d570, 0x0200, 0x2802
obj_tiles 0x08c2d6d0, 0x0020, 0x2803
obj_tiles 0x08c2e554, 0x0400, 0x2804
obj_tiles 0x08c2df08, 0x0600, 0x2805
obj_tiles 0x08c2e0ac, 0x1000, 0x2806
obj_tiles 0x08c2e64c, 0x0400, 0x2807
obj_tiles 0x08c2eba4, 0x0020, 0x2808
obj_tiles 0x08c2ebd4, 0x0080, 0x2809
obj_tiles 0x08c2ec44, 0x0800, 0x280a
obj_tiles 0x08c2ee38, 0x0080, 0x280b
obj_tiles 0x08c2eeb4, 0x0200, 0x280c
obj_tiles 0x08c2eff0, 0x0400, 0x280d
obj_tiles 0x08c2f1f4, 0x0200, 0x280e
obj_tiles 0x08c2f354, 0x0200, 0x280f
obj_tiles 0x08c2f4f0, 0x0800, 0x2810
obj_tiles 0x08c2f8a4, 0x0280, 0x2811
obj_tiles 0x08c2f3e0, 0x0200, 0x2812
obj_tiles 0x08c1b0a8, 0x0200, 0x2813
obj_tiles 0x08d8dae0, 0x0400, 0x2814
obj_tiles 0x08d8d2a4, 0x0200, 0x2815
obj_tiles 0x08d8e840, 0x0200, 0x2816
obj_tiles 0x08d93b44, 0x0080, 0x2817
obj_tiles 0x08d8ea54, 0x0020, 0x2818
obj_tiles 0x08d8ea54, 0x0020, 0x2819
obj_tiles 0x08d93b9c, 0x0080, 0x281a
obj_tiles 0x08c2407c, 0x0800, 0x281b
obj_tiles 0x08d8ea54, 0x0020, 0x281c
.align 2
gUnknown_085253AC:: @ 85253AC
.incbin "baserom.gba", 0x5253ac, 0x270
obj_tiles 0x08d8ef2c, 0x0080, 0x281d
obj_tiles 0x08dba378, 0x0400, 0x281e
obj_tiles 0x08dba4b8, 0x0080, 0x281f
obj_tiles 0x08d8ecc4, 0x0800, 0x2820
obj_tiles 0x08d8ef04, 0x0020, 0x2821
obj_tiles 0x08d8ef98, 0x0800, 0x2822
obj_tiles 0x08d8f118, 0x0800, 0x2823
obj_tiles 0x08d8f284, 0x0800, 0x2824
obj_tiles 0x08d92eec, 0x1000, 0x2825
obj_tiles 0x08d93c24, 0x0800, 0x2826
obj_tiles 0x08d93e4c, 0x00a0, 0x2827
obj_tiles 0x08d8f780, 0x0800, 0x2828
obj_tiles 0x08d93eb4, 0x0200, 0x2829
obj_tiles 0x08dba174, 0x0600, 0x282a
obj_tiles 0x08d93474, 0x0200, 0x282b
obj_tiles 0x08d94658, 0x0800, 0x282c
obj_tiles 0x08d949f0, 0x0200, 0x282d
obj_tiles 0x08c1e0b4, 0x0800, 0x282e
obj_tiles 0x08c0a3ec, 0x1000, 0x282f
obj_tiles 0x08c1bee4, 0x0100, 0x2830
obj_pal 0x08c028cc, 0x2710
obj_pal 0x08c1c794, 0x2711
obj_pal 0x08c20868, 0x2712
obj_pal 0x08c028f0, 0x2713
obj_pal 0x08c02918, 0x2714
obj_pal 0x08c0292c, 0x2715
obj_pal 0x08c02954, 0x2716
obj_pal 0x08c02b48, 0x2717
obj_pal 0x08c02b88, 0x2718
obj_pal 0x08c0328c, 0x2719
obj_pal 0x08c02ba4, 0x271a
obj_pal 0x08c03324, 0x271b
obj_pal 0x08c033b4, 0x271c
obj_pal 0x08c0346c, 0x271d
obj_pal 0x08c1fc68, 0x271e
obj_pal 0x08c034f0, 0x271f
obj_pal 0x08c03588, 0x2720
obj_pal 0x08c03588, 0x2721
obj_pal 0x08c24db8, 0x2722
obj_pal 0x08c035dc, 0x2723
obj_pal 0x08c03784, 0x2724
obj_pal 0x08c03a00, 0x2725
obj_pal 0x08c03d60, 0x2726
obj_pal 0x08c037ac, 0x2727
obj_pal 0x08c03f6c, 0x2728
obj_pal 0x08c03d88, 0x2729
obj_pal 0x08c047cc, 0x272a
obj_pal 0x08c047f4, 0x272b
obj_pal 0x08c04b18, 0x272c
obj_pal 0x08c05148, 0x272d
obj_pal 0x08c05530, 0x272e
obj_pal 0x08c04360, 0x272f
obj_pal 0x08c04380, 0x2730
obj_pal 0x08c05554, 0x2731
obj_pal 0x08c05554, 0x2732
obj_pal 0x08c05554, 0x2733
obj_pal 0x08c06650, 0x2734
obj_pal 0x08c06650, 0x2735
obj_pal 0x08c07914, 0x2736
obj_pal 0x08c0793c, 0x2737
obj_pal 0x08c07914, 0x2738
obj_pal 0x08c07914, 0x2739
obj_pal 0x08c08594, 0x273a
obj_pal 0x08c089bc, 0x273b
obj_pal 0x08c089e4, 0x273c
obj_pal 0x08c08c78, 0x273d
obj_pal 0x08c099e4, 0x273e
obj_pal 0x08c09a04, 0x273e
obj_pal 0x08c09f88, 0x2740
obj_pal 0x08c09fb0, 0x2741
obj_pal 0x08c09fd8, 0x2742
obj_pal 0x08c09fd8, 0x2743
obj_pal 0x08c09fd8, 0x2744
obj_pal 0x08c047cc, 0x2745
obj_pal 0x08c0a3d4, 0x2746
obj_pal 0x08c09fd8, 0x2747
obj_pal 0x08c0a894, 0x2748
obj_pal 0x08c0aa08, 0x2749
.align 2
gUnknown_0852561C:: @ 852561C
.incbin "baserom.gba", 0x52561c, 0x270
obj_pal 0x08c0ae94, 0x274a
obj_pal 0x08c0af1c, 0x274b
obj_pal 0x08c0af60, 0x274c
obj_pal 0x08c0b02c, 0x274d
obj_pal 0x08c0b41c, 0x274e
obj_pal 0x08c0b600, 0x274f
obj_pal 0x08c231f4, 0x2750
obj_pal 0x08c0b7d0, 0x2751
obj_pal 0x08c0b83c, 0x2752
obj_pal 0x08d8eaa4, 0x2753
obj_pal 0x08d8eac4, 0x2754
obj_pal 0x08c0b7d0, 0x2755
obj_pal 0x08c0b8e4, 0x2756
obj_pal 0x08c0b8e4, 0x2757
obj_pal 0x08c0bc08, 0x2758
obj_pal 0x08c0bd3c, 0x2759
obj_pal 0x08c1b304, 0x275a
obj_pal 0x08c0bfd8, 0x275b
obj_pal 0x08c14f28, 0x275c
obj_pal 0x08c14f28, 0x275d
obj_pal 0x08c0c194, 0x275e
obj_pal 0x08c0c194, 0x275f
obj_pal 0x08c0c950, 0x2760
obj_pal 0x08c0c9f8, 0x2761
obj_pal 0x08c0cbb4, 0x2762
obj_pal 0x08c0cbc8, 0x2763
obj_pal 0x08c0cbf0, 0x2764
obj_pal 0x08c0cc18, 0x2765
obj_pal 0x08c0cc30, 0x2766
obj_pal 0x08c24d54, 0x2767
obj_pal 0x08c0cc58, 0x2768
obj_pal 0x08c0cc74, 0x2769
obj_pal 0x08c0cc9c, 0x276a
obj_pal 0x08c0b698, 0x276b
obj_pal 0x08c0ccc0, 0x276c
obj_pal 0x08c0ccdc, 0x276d
obj_pal 0x08c0cd04, 0x276e
obj_pal 0x08c0cd44, 0x276f
obj_pal 0x08c0cd6c, 0x2770
obj_pal 0x08c0cd88, 0x2771
obj_pal 0x08c0cd04, 0x2772
obj_pal 0x08c27e0c, 0x2773
obj_pal 0x08c0cdb0, 0x2774
obj_pal 0x08c0cdcc, 0x2775
obj_pal 0x08c0cdcc, 0x2776
obj_pal 0x08c0cdf4, 0x2777
obj_pal 0x08c0f14c, 0x2778
obj_pal 0x08c0f6f8, 0x2779
obj_pal 0x08c0f6f8, 0x277a
obj_pal 0x08c0fbbc, 0x277b
obj_pal 0x08c0fbbc, 0x277c
obj_pal 0x08c0ff90, 0x277d
obj_pal 0x08c0ff90, 0x277e
obj_pal 0x08c103e0, 0x277f
obj_pal 0x08c1072c, 0x2780
obj_pal 0x08c109c0, 0x2781
obj_pal 0x08c10adc, 0x2782
obj_pal 0x08c028ac, 0x2783
obj_pal 0x08c13134, 0x2784
obj_pal 0x08c13398, 0x2785
obj_pal 0x08c1354c, 0x2786
obj_pal 0x08c137f8, 0x2787
obj_pal 0x08c13914, 0x2788
obj_pal 0x08c13968, 0x2789
obj_pal 0x08c13a88, 0x278a
obj_pal 0x08c13a88, 0x278b
obj_pal 0x08c13e78, 0x278c
obj_pal 0x08c13f8c, 0x278d
obj_pal 0x08c1401c, 0x278e
obj_pal 0x08c141dc, 0x278f
obj_pal 0x08c1446c, 0x2790
obj_pal 0x08c1446c, 0x2791
obj_pal 0x08c148c0, 0x2792
obj_pal 0x08c148c0, 0x2793
obj_pal 0x08c14b58, 0x2794
obj_pal 0x08c14bf4, 0x2795
obj_pal 0x08c14bf4, 0x2796
obj_pal 0x08c1a478, 0x2797
.align 2
gUnknown_0852588C:: @ 852588C
.incbin "baserom.gba", 0x52588c, 0x308
obj_pal 0x08c1a564, 0x2798
obj_pal 0x08c1a478, 0x2799
obj_pal 0x08c1a478, 0x279a
obj_pal 0x08c1a980, 0x279b
obj_pal 0x08c1ad0c, 0x279c
obj_pal 0x08c1ae34, 0x279d
obj_pal 0x08c1ae34, 0x279e
obj_pal 0x08c2cddc, 0x279f
obj_pal 0x08c1bcdc, 0x27a0
obj_pal 0x08c1a980, 0x27a1
obj_pal 0x08c028ac, 0x27a2
obj_pal 0x08c1b080, 0x27a3
obj_pal 0x08c1b25c, 0x27a4
obj_pal 0x08c1b25c, 0x27a5
obj_pal 0x08c1b3fc, 0x27a6
obj_pal 0x08c1b3fc, 0x27a7
obj_pal 0x08c03414, 0x27a8
obj_pal 0x08c1b57c, 0x27a9
obj_pal 0x08c1b640, 0x27aa
obj_pal 0x08c1b728, 0x27ab
obj_pal 0x08c1b960, 0x27ac
obj_pal 0x08c1b9ec, 0x27ad
obj_pal 0x08c1bacc, 0x27ae
obj_pal 0x08c1bb6c, 0x27af
obj_pal 0x08c1bc3c, 0x27b0
obj_pal 0x08c029a4, 0x27b1
obj_pal 0x08c1bec4, 0x27b2
obj_pal 0x08c1bf44, 0x27b3
obj_pal 0x08c1bf74, 0x27b4
obj_pal 0x08c1bf8c, 0x27b5
obj_pal 0x08c1c2b0, 0x27b6
obj_pal 0x08c1c2d0, 0x27b7
obj_pal 0x08c1c2f0, 0x27b8
obj_pal 0x08c1c310, 0x27b9
obj_pal 0x08c1c330, 0x27ba
obj_pal 0x08c1c39c, 0x27bb
obj_pal 0x08c1c3c4, 0x27bc
obj_pal 0x08c1c794, 0x27bd
obj_pal 0x08c1d69c, 0x27be
obj_pal 0x08c1d728, 0x27bf
obj_pal 0x08c1d8a8, 0x27c0
obj_pal 0x08c1d994, 0x27c1
obj_pal 0x08c1db14, 0x27c2
obj_pal 0x08c1db3c, 0x27c3
obj_pal 0x08c1db3c, 0x27c4
obj_pal 0x08c1db3c, 0x27c5
obj_pal 0x08c1e08c, 0x27c6
obj_pal 0x08c1e32c, 0x27c7
obj_pal 0x08c1e4a8, 0x27c8
obj_pal 0x08c1e8e4, 0x27c9
obj_pal 0x08c1f1a4, 0x27ca
obj_pal 0x08c1edb8, 0x27cb
obj_pal 0x08d967d4, 0x27cc
obj_pal 0x08c2021c, 0x27cd
obj_pal 0x08c1fee0, 0x27ce
obj_pal 0x08c20170, 0x27cf
obj_pal 0x08c204bc, 0x27d0
obj_pal 0x08c20640, 0x27d1
obj_pal 0x08c20f84, 0x27d2
obj_pal 0x08c21064, 0x27d3
obj_pal 0x08c20c34, 0x27d4
obj_pal 0x08c211f4, 0x27d5
obj_pal 0x08c2160c, 0x27d6
obj_pal 0x08c216fc, 0x27d7
obj_pal 0x08c21858, 0x27d8
obj_pal 0x08c21ee4, 0x27d9
obj_pal 0x08c22210, 0x27da
obj_pal 0x08c223e0, 0x27db
obj_pal 0x08c22080, 0x27dc
obj_pal 0x08c228d8, 0x27dd
obj_pal 0x08c22610, 0x27de
obj_pal 0x08c229c8, 0x27df
obj_pal 0x08c1c2d0, 0x27e0
obj_pal 0x08c230e4, 0x27e1
obj_pal 0x08c232a0, 0x27e2
obj_pal 0x08c2456c, 0x27e3
obj_pal 0x08c2456c, 0x27e4
obj_pal 0x08c2456c, 0x27e5
obj_pal 0x08c231f4, 0x27e6
obj_pal 0x08c249ac, 0x27e7
obj_pal 0x08c232c0, 0x27e8
obj_pal 0x08c2405c, 0x27e9
obj_pal 0x08c24c28, 0x27ea
obj_pal 0x08c23280, 0x27eb
obj_pal 0x08c24dd4, 0x27ec
obj_pal 0x08c24f28, 0x27ed
obj_pal 0x08c25498, 0x27ee
obj_pal 0x08c254c0, 0x27ef
obj_pal 0x08c25774, 0x27f0
obj_pal 0x08c278e8, 0x27f1
obj_pal 0x08c27ae4, 0x27f2
obj_pal 0x08c27ae4, 0x27f3
obj_pal 0x08c25afc, 0x27f4
obj_pal 0x08c27cc4, 0x27f5
obj_pal 0x08c25890, 0x27f6
obj_pal 0x08c2836c, 0x27f7
obj_pal 0x08c2836c, 0x27f8
.align 2
gUnknown_08525B94:: @ 8525B94
.incbin "baserom.gba", 0x525b94, 0x120
obj_pal 0x08c285e8, 0x27f9
obj_pal 0x08c287d0, 0x27fa
obj_pal 0x08c288d0, 0x27fb
obj_pal 0x08c288ec, 0x27fc
obj_pal 0x08c28908, 0x27fd
obj_pal 0x08c2885c, 0x27fe
obj_pal 0x08c2cb84, 0x27ff
obj_pal 0x08c2ce94, 0x2800
obj_pal 0x08c2d40c, 0x2801
obj_pal 0x08c2d6ac, 0x2802
obj_pal 0x08c2d6f8, 0x2803
obj_pal 0x08c2e630, 0x2804
obj_pal 0x08c2dee0, 0x2805
obj_pal 0x08c2dee0, 0x2806
obj_pal 0x08c231f4, 0x2807
obj_pal 0x08c2ebbc, 0x2808
obj_pal 0x08c2ec24, 0x2809
obj_pal 0x08c2ec24, 0x280a
obj_pal 0x08c2ee9c, 0x280b
obj_pal 0x08c2efcc, 0x280c
obj_pal 0x08c2f1cc, 0x280d
obj_pal 0x08c2f32c, 0x280e
obj_pal 0x08c2f3cc, 0x280f
obj_pal 0x08c2f87c, 0x2810
obj_pal 0x08c2f9c0, 0x2811
obj_pal 0x08c2f4c8, 0x2812
obj_pal 0x08c1b27c, 0x2813
obj_pal 0x08d8dc9c, 0x2814
obj_pal 0x08d8dab8, 0x2815
obj_pal 0x08d8e914, 0x2816
obj_pal 0x08d93b84, 0x2817
obj_pal 0x08d8ea74, 0x2818
obj_pal 0x08d8ea8c, 0x2819
obj_pal 0x08d93bdc, 0x281a
obj_pal 0x08d93bf4, 0x281b
obj_pal 0x08d93c0c, 0x281c
.align 2
gUnknown_08525CB4:: @ 8525CB4
.incbin "baserom.gba", 0x525cb4, 0xa0
obj_pal 0x08d8ef80, 0x281d
obj_pal 0x08dba35c, 0x281e
obj_pal 0x08dba4a0, 0x281f
obj_pal 0x08d8eee0, 0x2820
obj_pal 0x08d8eee0, 0x2821
obj_pal 0x08d8f3ec, 0x2822
obj_pal 0x08d8f3ec, 0x2823
obj_pal 0x08d8f3ec, 0x2824
obj_pal 0x08d92ec4, 0x2825
obj_pal 0x08d93e30, 0x2826
obj_pal 0x08d93e98, 0x2827
obj_pal 0x08d8fb7c, 0x2828
obj_pal 0x08d9403c, 0x2829
obj_pal 0x08dba14c, 0x282a
obj_pal 0x08d93458, 0x282b
obj_pal 0x08d949d4, 0x282c
obj_pal 0x08d94a90, 0x282d
obj_pal 0x08d96698, 0x282e
obj_pal 0x08d9104c, 0x282f
obj_pal 0x08c1bf5c, 0x2830
.align 2
gUnknown_08525D54:: @ 8525D54
.incbin "baserom.gba", 0x525d54, 0x144
.4byte 0x08c1c844, 0x08c1ce3c, 0x08c1ce5c
.4byte 0x08c1c844, 0x08c1ce3c, 0x08c1ce5c
.4byte 0x08d90074, 0x08d90d3c, 0x08d90d58
.4byte 0x08c1e90c, 0x08c1eadc, 0x08c1eb00
.4byte 0x08c25bec, 0x08c25bc4, 0x08c26958
.4byte 0x08c25bec, 0x08c25bc4, 0x08c26e54
.4byte 0x08c25bec, 0x08c25bc4, 0x08c27324
.4byte 0x08c28924, 0x08c28acc, 0x08c28b1c
.4byte 0x08c28924, 0x08c28acc, 0x08c28cac
.4byte 0x08c29dbc, 0x08c29d7c, 0x08c29a84
.4byte 0x08c29dbc, 0x08c29d7c, 0x08c2a33c
.4byte 0x08c2bde4, 0x08c2c780, 0x08c2c7a8
.4byte 0x08c2b05c, 0x08c2bdc4, 0x08c2a808
.4byte 0x08c2b05c, 0x08c2bdc4, 0x08c2aad0
.4byte 0x08c2b05c, 0x08c2bdc4, 0x08c2adcc
.4byte 0x08d8dcb4, 0x08d8e624, 0x08d8e648
.4byte 0x08d92b28, 0x08d92b00, 0x08d92d88
.4byte 0x08d8f414, 0x08d8f570, 0x08d8f598
.4byte 0x08c28924, 0x08c28af4, 0x08c28b1c
.4byte 0x08c28924, 0x08c28af4, 0x08c28cac
.4byte 0x08c28e38, 0x08c29860, 0x08c29880
.4byte 0x08d9405c, 0x08d94350, 0x08d9436c
.4byte 0x08c29dbc, 0x08c29d9c, 0x08c29a84
.4byte 0x08c29dbc, 0x08c29d9c, 0x08c2a33c
.4byte 0x08c25bec, 0x08d91074, 0x08c26958
.4byte 0x08c25bec, 0x08d91074, 0x08c26e54
.4byte 0x08c25bec, 0x08d91074, 0x08c27324
.align 2
gUnknown_08525E98:: @ 8525E98
.incbin "baserom.gba", 0x525e98, 0xc0
.4byte ma00_load_graphics
.4byte ma01_080728D0
.4byte ma02_instanciate_template
.4byte sub_80A3ECC
.4byte ma04_wait_countdown
.4byte sub_80A3F88
.4byte nullsub_6
.4byte nullsub_7
.4byte sub_80A3FC4
.4byte ma09_play_sound
.4byte sub_80A41D8
.4byte ma0B_0807324C
.4byte ma0C_set_BLDCNT_to_x3F40_and_BLDALPHA_to_argument
.4byte ma0D_reset_BLDCNT_and_BLDALPHA
.4byte ma0E_call
.4byte sub_80A4D00
.4byte ma10_080736AC
.4byte ma11_if_else
.4byte ma12_cond_if
.4byte ma13_goto
.4byte ma14_load_background
.4byte ma15_load_battle_screen_elements
.4byte ma16_wait_for_battle_screen_elements_s2
.4byte sub_80A5124
.4byte ma18_load_background_probably
.4byte ma19_08073BC8
.4byte ma1A_8073C00
.4byte ma1B_8073C2C
.4byte ma1C_8073ED0
.4byte ma1D_08073FB4
.4byte ma1E_set_BLDCNT
.4byte sub_80A57F8
.4byte ma20_wait_for_something
.4byte ma21_08074164
.4byte sub_80A4A18
.4byte ma23_8073484
.4byte sub_80A5944
.4byte sub_80A4E5C
.4byte sub_80A5508
.4byte sub_80A559C
.4byte sub_80A5984
.4byte sub_80A59DC
.4byte sub_80A5A0C
.4byte ma2B_make_side_invisible
.4byte ma2C_make_side_visible
.4byte sub_80A5AFC
.4byte sub_80A5BAC
.4byte ma2F_stop_music
.align 2
gUnknown_08525F58:: @ 8525F58
.incbin "baserom.gba", 0x525f58, 0x20
.byte 0x48, 0x50, 0x00, 0x00, 0xb0, 0x28, 0x00, 0x00
.byte 0x30, 0x28, 0x00, 0x00, 0x70, 0x50, 0x00, 0x00
.byte 0x20, 0x50, 0x00, 0x00, 0xc8, 0x28, 0x00, 0x00
.byte 0x5a, 0x58, 0x00, 0x00, 0x98, 0x20, 0x00, 0x00
.align 2
gCastformFrontSpriteCoords:: @ 8525F78
.incbin "baserom.gba", 0x525f78, 0x10
.byte 0x44, 0x11, 0x00, 0x00, 0x66, 0x09, 0x00, 0x00
.byte 0x46, 0x09, 0x00, 0x00, 0x86, 0x08, 0x00, 0x00
.align 2
gUnknown_08525F88:: @ 8525F88
.incbin "baserom.gba", 0x525f88, 0x4
.byte 0x0d, 0x0e, 0x0d, 0x0d
.align 2
gUnknown_08525F8C:: @ 8525F8C
.incbin "baserom.gba", 0x525f8c, 0x4
.byte 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_08525F90:: @ 8525F90
.incbin "baserom.gba", 0x525f90, 0x30
spr_template 0xd755, 0xd755, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0xd756, 0xd756, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08525FC0:: @ 8525FC0
.incbin "baserom.gba", 0x525fc0, 0x18f80
obj_tiles gMiscBlank_Gfx, 0x0800, 0xd755
obj_tiles gMiscBlank_Gfx, 0x0800, 0xd756
.align 2
@ the mother of all baserom includes
.incbin "baserom.gba", 0x525fd0, 0x18f60
.align 2
gUnknown_0853EF30:: @ 853EF30
.byte 0xf0, 0xf0, 0x0c, 0x80, 0xf0, 0x30, 0x0d, 0x84, 0x30, 0xf0, 0x0e, 0x86, 0x30, 0x30, 0x08, 0x88
.align 2
gUnknown_0853EF40:: @ 853EF40
.incbin "baserom.gba", 0x53ef40, 0x8
.4byte 0x00000004, gUnknown_0853EF30
.align 2
gUnknown_0853EF48:: @ 853EF48
.incbin "baserom.gba", 0x53ef48, 0x18
spr_template 0x271a, 0x271a, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0853EF60:: @ 853EF60
.incbin "baserom.gba", 0x53ef60, 0xf8
spr_template 0x2798, 0x2798, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9E44

File diff suppressed because it is too large Load Diff

View File

@ -5,19 +5,54 @@
.align 2, 0
gUnknown_0859744C:: @ 859744C
.incbin "baserom.gba", 0x59744c, 0x10
.4byte sub_8119224
.4byte sub_8119238
.4byte sub_8119280
.4byte sub_8119344
.align 2
gUnknown_0859745C:: @ 859745C
.incbin "baserom.gba", 0x59745c, 0xc
.4byte PlayerGoSpeed0
.4byte PlayerGoSpeed1
.4byte PlayerGoSpeed3
.align 2
gUnknown_08597468:: @ 8597468
.incbin "baserom.gba", 0x597468, 0x34
.4byte sub_81197E4
.4byte sub_81197F4
.4byte sub_8119830
.4byte sub_81198C0
.4byte sub_81198FC
.4byte sub_8119938
.4byte sub_8119974
.4byte sub_81199B0
.4byte sub_8119A24
.4byte sub_8119A94
.4byte sub_8119AA4
.4byte sub_8119B34
.4byte sub_8119BC4
.align 2
gUnknown_0859749C:: @ 859749C
.incbin "baserom.gba", 0x59749c, 0x1c
.4byte CheckMovementInputAcroBikeNormal
.4byte CheckMovementInputAcroBikeChangingDirection
.4byte CheckMovementInputAcroBikeStandingWheelie
.4byte CheckMovementInputAcroBikeBunnyHop
.4byte CheckMovementInputAcroBikeMovingWheelie
.4byte CheckMovementInputAcroBikeUnknownMode5
.4byte CheckMovementInputAcroBikeUnknownMode6
.align 2
gUnknown_085974B8:: @ 85974B8
.incbin "baserom.gba", 0x5974b8, 0x8
.2byte 0x0001, 0x0002, 0x0004
.align 1
gUnknown_085974BE:: @ 85974BE
.2byte 0x0004
.align 2
gUnknown_085974C0:: @ 85974C0
.incbin "baserom.gba", 0x5974c0, 0x70
.4byte 0x00000001, 0x00000002, 0x0000000f, 0x0000000f, gUnknown_085974BE, gUnknown_085974BE, 0x00000001
.4byte 0x00000002, 0x00000002, 0x0000000f, 0x0000000f, gUnknown_085974BE, gUnknown_085974BE, 0x00000002
.4byte 0x00000003, 0x00000002, 0x0000000f, 0x0000000f, gUnknown_085974BE, gUnknown_085974BE, 0x00000003
.4byte 0x00000004, 0x00000002, 0x0000000f, 0x0000000f, gUnknown_085974BE, gUnknown_085974BE, 0x00000004

View File

@ -4,8 +4,13 @@
.section .rodata
.align 2, 0
.align 2
gUnknown_08550594:: @ 8550594
.incbin "baserom.gba", 0x550594, 0x8
window_template 0x00, 0x10, 0x0b, 0x0b, 0x02, 0x0f, 0x0125
.align 2
gUnknown_0855059C:: @ 855059C
.incbin "baserom.gba", 0x55059c, 0x190
.4byte gText_BronzeCard
.4byte gText_CopperCard
.4byte gText_SilverCard
.4byte gText_GoldCard

File diff suppressed because it is too large Load Diff

View File

@ -11,8 +11,9 @@
@ 831C898
.include "data/battle_moves.inc"
@ 0x31d93c unreferenced unknown data
.byte 0x34, 0x00, 0x10, 0x00, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00
@ 0x31d93c
@ unreferenced unknown data
.byte 0x34, 0x00, 0x10, 0x00, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00
@ 831D94C
.include "data/pokedex_order.inc"
@ -53,56 +54,142 @@
@ 832937C
.include "data/level_up_learnset_pointers.inc"
gMonFrontAnimIdsTable:: @ 83299EC
.incbin "baserom.gba", 0x3299ec, 0x19b
@ 83299EC
.include "data/graphics/pokemon/front_anim_ids_table.inc"
gMonAnimationDelayTable:: @ 8329B87
.incbin "baserom.gba", 0x329b87, 0x19b
@ 8329B87
.include "data/graphics/pokemon/animation_delay_table.inc"
.align 1
gUnknown_08329D22:: @ 8329D22
.incbin "baserom.gba", 0x329d22, 0x4
@ Masks for getting PP Up count, also PP Max values
.byte 0x03, 0x0c, 0x30, 0xc0
.align 1
gUnknown_08329D26:: @ 8329D26
.incbin "baserom.gba", 0x329d26, 0x4
@ Masks for setting PP Up count
.byte 0xfc, 0xf3, 0xcf, 0x3f
.align 1
gUnknown_08329D2A:: @ 8329D2A
.incbin "baserom.gba", 0x329d2a, 0x4
@ Values added to PP Up count
.byte 0x01, 0x04, 0x10, 0x40
.align 1
gStatStageRatios:: @ 8329D2E
.incbin "baserom.gba", 0x329d2e, 0x1a
.byte 0x0a, 0x28
.byte 0x0a, 0x23
.byte 0x0a, 0x1e
.byte 0x0a, 0x19
.byte 0x0a, 0x14
.byte 0x0a, 0x0f
.byte 0x0a, 0x0a
.byte 0x0f, 0x0a
.byte 0x14, 0x0a
.byte 0x19, 0x0a
.byte 0x1e, 0x0a
.byte 0x23, 0x0a
.byte 0x28, 0x0a
.align 1
gUnknown_08329D48:: @ 8329D48
.incbin "baserom.gba", 0x329d48, 0xc
.2byte 0x0032, 0x005f, 0x005a, 0x00b4, 0x005f, 0x005a
.align 1
gUnknown_08329D54:: @ 8329D54
.incbin "baserom.gba", 0x329d54, 0x20
.2byte 0x0003, 0x000a, 0x001b, 0x002b, 0x001e, 0x0043, 0x0042, 0x0019
.2byte 0x0012, 0x000c, 0x001c, 0x0047, 0x001f, 0x0036, 0x0002, 0x0014
.align 1
gHoldEffectToType:: @ 8329D74
.incbin "baserom.gba", 0x329d74, 0x24
.byte 0x1f, 0x06
.byte 0x2a, 0x08
.byte 0x2e, 0x04
.byte 0x2f, 0x05
.byte 0x30, 0x0c
.byte 0x31, 0x11
.byte 0x32, 0x01
.byte 0x33, 0x0d
.byte 0x34, 0x0b
.byte 0x35, 0x02
.byte 0x36, 0x03
.byte 0x37, 0x0f
.byte 0x38, 0x07
.byte 0x39, 0x0e
.byte 0x3a, 0x0a
.byte 0x3b, 0x10
.byte 0x3c, 0x00
.byte 0x00, 0x00
.align 2
gUnknown_08329D98:: @ 8329D98
.incbin "baserom.gba", 0x329d98, 0x60
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF3A8, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACA8, NULL, gUnknown_082FF3C8, gUnknown_082FF694, oac_poke_opponent
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF3E8, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACA8, NULL, gUnknown_082FF408, gUnknown_082FF694, oac_poke_opponent
.align 2
gUnknown_08329DF8:: @ 8329DF8
.incbin "baserom.gba", 0x329df8, 0xc0
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF428, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF448, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF468, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF490, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF4B8, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF4D8, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF4F8, gUnknown_082FF618, sub_8039BB4
spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF518, gUnknown_082FF618, sub_8039BB4
gSecretBaseTrainerClasses:: @ 8329EB8
.incbin "baserom.gba", 0x329eb8, 0xa
.byte TRAINER_CLASS_YOUNGSTER, TRAINER_CLASS_BUG_CATCHER, TRAINER_CLASS_RICH_BOY, TRAINER_CLASS_CAMPER, TRAINER_CLASS_COOLTRAINER_1
.byte TRAINER_CLASS_LASS, TRAINER_CLASS_SCHOOL_KID_2, TRAINER_CLASS_LADY, TRAINER_CLASS_PICNICKER, TRAINER_CLASS_COOLTRAINER_2
gUnknown_08329EC2:: @ 8329EC2
.incbin "baserom.gba", 0x329ec2, 0x6
.byte 0x1a, 0x1b, 0x1c, 0x1d, 0x1f, 0x1e
gUnknown_08329EC8:: @ 8329EC8
.incbin "baserom.gba", 0x329ec8, 0x6
.byte 1, 1, 3, 2, 4, 6
gUnknown_08329ECE:: @ 8329ECE
.incbin "baserom.gba", 0x329ece, 0x1c
@ Happiness deltas
.byte 0x05, 0x03, 0x02
.byte 0x05, 0x03, 0x02
.byte 0x01, 0x01, 0x00
.byte 0x03, 0x02, 0x01
.byte 0x01, 0x01, 0x00
.byte 0x01, 0x01, 0x01
.byte 0xff, 0xff, 0xff
.byte 0xfb, 0xfb, 0xf6
.byte 0xfb, 0xfb, 0xf6
.align 1
gHMMoves:: @ 8329EEA
.incbin "baserom.gba", 0x329eea, 0x12
.2byte MOVE_CUT
.2byte MOVE_FLY
.2byte MOVE_SURF
.2byte MOVE_STRENGTH
.2byte MOVE_FLASH
.2byte MOVE_ROCK_SMASH
.2byte MOVE_WATERFALL
.2byte MOVE_DIVE
.2byte 0xffff
.align 1
gAlteringCaveWildMonHeldItems:: @ 8329EFC
.incbin "baserom.gba", 0x329efc, 0x2c
.2byte 0, ITEM_NONE
.2byte SPECIES_MAREEP, ITEM_GANLON_BERRY
.2byte SPECIES_PINECO, ITEM_APICOT_BERRY
.2byte SPECIES_HOUNDOUR, ITEM_BIG_MUSHROOM
.2byte SPECIES_TEDDIURSA, ITEM_PETAYA_BERRY
.2byte SPECIES_AIPOM, ITEM_BERRY_JUICE
.2byte SPECIES_SHUCKLE, ITEM_BERRY_JUICE
.2byte SPECIES_STANTLER, ITEM_PETAYA_BERRY
.2byte SPECIES_SMEARGLE, ITEM_SALAC_BERRY
.align 2
gUnknown_08329F20:: @ 8329F20
.byte 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_08329F28:: @ 8329F28
.incbin "baserom.gba", 0x329f28, 0x18
spr_template 0xffff, 0xffff, gUnknown_08329F20, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy

View File

@ -0,0 +1,415 @@
@ This determines how much higher above the usual position the enemy Pokémon
@ is during battle. Species that float or fly have nonzero values.
gEnemyMonElevation:: @ 8305DCC
.byte 0 @ 0
.byte 0 @ SPECIES_BULBASAUR
.byte 0 @ SPECIES_IVYSAUR
.byte 0 @ SPECIES_VENUSAUR
.byte 0 @ SPECIES_CHARMANDER
.byte 0 @ SPECIES_CHARMELEON
.byte 0 @ SPECIES_CHARIZARD
.byte 0 @ SPECIES_SQUIRTLE
.byte 0 @ SPECIES_WARTORTLE
.byte 0 @ SPECIES_BLASTOISE
.byte 0 @ SPECIES_CATERPIE
.byte 0 @ SPECIES_METAPOD
.byte 8 @ SPECIES_BUTTERFREE
.byte 0 @ SPECIES_WEEDLE
.byte 0 @ SPECIES_KAKUNA
.byte 8 @ SPECIES_BEEDRILL
.byte 16 @ SPECIES_PIDGEY
.byte 0 @ SPECIES_PIDGEOTTO
.byte 4 @ SPECIES_PIDGEOT
.byte 0 @ SPECIES_RATTATA
.byte 0 @ SPECIES_RATICATE
.byte 0 @ SPECIES_SPEAROW
.byte 6 @ SPECIES_FEAROW
.byte 0 @ SPECIES_EKANS
.byte 0 @ SPECIES_ARBOK
.byte 0 @ SPECIES_PIKACHU
.byte 0 @ SPECIES_RAICHU
.byte 0 @ SPECIES_SANDSHREW
.byte 0 @ SPECIES_SANDSLASH
.byte 0 @ SPECIES_NIDORAN_F
.byte 0 @ SPECIES_NIDORINA
.byte 0 @ SPECIES_NIDOQUEEN
.byte 0 @ SPECIES_NIDORAN_M
.byte 0 @ SPECIES_NIDORINO
.byte 0 @ SPECIES_NIDOKING
.byte 0 @ SPECIES_CLEFAIRY
.byte 0 @ SPECIES_CLEFABLE
.byte 0 @ SPECIES_VULPIX
.byte 0 @ SPECIES_NINETALES
.byte 0 @ SPECIES_JIGGLYPUFF
.byte 0 @ SPECIES_WIGGLYTUFF
.byte 8 @ SPECIES_ZUBAT
.byte 8 @ SPECIES_GOLBAT
.byte 0 @ SPECIES_ODDISH
.byte 0 @ SPECIES_GLOOM
.byte 0 @ SPECIES_VILEPLUME
.byte 0 @ SPECIES_PARAS
.byte 0 @ SPECIES_PARASECT
.byte 0 @ SPECIES_VENONAT
.byte 8 @ SPECIES_VENOMOTH
.byte 0 @ SPECIES_DIGLETT
.byte 0 @ SPECIES_DUGTRIO
.byte 0 @ SPECIES_MEOWTH
.byte 0 @ SPECIES_PERSIAN
.byte 0 @ SPECIES_PSYDUCK
.byte 0 @ SPECIES_GOLDUCK
.byte 0 @ SPECIES_MANKEY
.byte 0 @ SPECIES_PRIMEAPE
.byte 0 @ SPECIES_GROWLITHE
.byte 0 @ SPECIES_ARCANINE
.byte 0 @ SPECIES_POLIWAG
.byte 0 @ SPECIES_POLIWHIRL
.byte 0 @ SPECIES_POLIWRATH
.byte 0 @ SPECIES_ABRA
.byte 0 @ SPECIES_KADABRA
.byte 0 @ SPECIES_ALAKAZAM
.byte 0 @ SPECIES_MACHOP
.byte 0 @ SPECIES_MACHOKE
.byte 0 @ SPECIES_MACHAMP
.byte 0 @ SPECIES_BELLSPROUT
.byte 0 @ SPECIES_WEEPINBELL
.byte 0 @ SPECIES_VICTREEBEL
.byte 0 @ SPECIES_TENTACOOL
.byte 0 @ SPECIES_TENTACRUEL
.byte 16 @ SPECIES_GEODUDE
.byte 0 @ SPECIES_GRAVELER
.byte 0 @ SPECIES_GOLEM
.byte 0 @ SPECIES_PONYTA
.byte 0 @ SPECIES_RAPIDASH
.byte 0 @ SPECIES_SLOWPOKE
.byte 0 @ SPECIES_SLOWBRO
.byte 16 @ SPECIES_MAGNEMITE
.byte 8 @ SPECIES_MAGNETON
.byte 0 @ SPECIES_FARFETCHD
.byte 0 @ SPECIES_DODUO
.byte 0 @ SPECIES_DODRIO
.byte 0 @ SPECIES_SEEL
.byte 0 @ SPECIES_DEWGONG
.byte 0 @ SPECIES_GRIMER
.byte 0 @ SPECIES_MUK
.byte 0 @ SPECIES_SHELLDER
.byte 0 @ SPECIES_CLOYSTER
.byte 4 @ SPECIES_GASTLY
.byte 4 @ SPECIES_HAUNTER
.byte 0 @ SPECIES_GENGAR
.byte 0 @ SPECIES_ONIX
.byte 0 @ SPECIES_DROWZEE
.byte 0 @ SPECIES_HYPNO
.byte 0 @ SPECIES_KRABBY
.byte 0 @ SPECIES_KINGLER
.byte 10 @ SPECIES_VOLTORB
.byte 12 @ SPECIES_ELECTRODE
.byte 0 @ SPECIES_EXEGGCUTE
.byte 0 @ SPECIES_EXEGGUTOR
.byte 0 @ SPECIES_CUBONE
.byte 0 @ SPECIES_MAROWAK
.byte 0 @ SPECIES_HITMONLEE
.byte 0 @ SPECIES_HITMONCHAN
.byte 0 @ SPECIES_LICKITUNG
.byte 8 @ SPECIES_KOFFING
.byte 6 @ SPECIES_WEEZING
.byte 0 @ SPECIES_RHYHORN
.byte 0 @ SPECIES_RHYDON
.byte 0 @ SPECIES_CHANSEY
.byte 0 @ SPECIES_TANGELA
.byte 0 @ SPECIES_KANGASKHAN
.byte 0 @ SPECIES_HORSEA
.byte 0 @ SPECIES_SEADRA
.byte 0 @ SPECIES_GOLDEEN
.byte 0 @ SPECIES_SEAKING
.byte 0 @ SPECIES_STARYU
.byte 0 @ SPECIES_STARMIE
.byte 0 @ SPECIES_MR_MIME
.byte 0 @ SPECIES_SCYTHER
.byte 0 @ SPECIES_JYNX
.byte 0 @ SPECIES_ELECTABUZZ
.byte 0 @ SPECIES_MAGMAR
.byte 0 @ SPECIES_PINSIR
.byte 0 @ SPECIES_TAUROS
.byte 0 @ SPECIES_MAGIKARP
.byte 0 @ SPECIES_GYARADOS
.byte 0 @ SPECIES_LAPRAS
.byte 0 @ SPECIES_DITTO
.byte 0 @ SPECIES_EEVEE
.byte 0 @ SPECIES_VAPOREON
.byte 0 @ SPECIES_JOLTEON
.byte 0 @ SPECIES_FLAREON
.byte 0 @ SPECIES_PORYGON
.byte 0 @ SPECIES_OMANYTE
.byte 0 @ SPECIES_OMASTAR
.byte 0 @ SPECIES_KABUTO
.byte 0 @ SPECIES_KABUTOPS
.byte 7 @ SPECIES_AERODACTYL
.byte 0 @ SPECIES_SNORLAX
.byte 6 @ SPECIES_ARTICUNO
.byte 8 @ SPECIES_ZAPDOS
.byte 5 @ SPECIES_MOLTRES
.byte 0 @ SPECIES_DRATINI
.byte 0 @ SPECIES_DRAGONAIR
.byte 6 @ SPECIES_DRAGONITE
.byte 0 @ SPECIES_MEWTWO
.byte 8 @ SPECIES_MEW
.byte 0 @ SPECIES_CHIKORITA
.byte 0 @ SPECIES_BAYLEEF
.byte 0 @ SPECIES_MEGANIUM
.byte 0 @ SPECIES_CYNDAQUIL
.byte 0 @ SPECIES_QUILAVA
.byte 0 @ SPECIES_TYPHLOSION
.byte 0 @ SPECIES_TOTODILE
.byte 0 @ SPECIES_CROCONAW
.byte 0 @ SPECIES_FERALIGATR
.byte 0 @ SPECIES_SENTRET
.byte 0 @ SPECIES_FURRET
.byte 0 @ SPECIES_HOOTHOOT
.byte 0 @ SPECIES_NOCTOWL
.byte 0 @ SPECIES_LEDYBA
.byte 8 @ SPECIES_LEDIAN
.byte 0 @ SPECIES_SPINARAK
.byte 0 @ SPECIES_ARIADOS
.byte 6 @ SPECIES_CROBAT
.byte 0 @ SPECIES_CHINCHOU
.byte 0 @ SPECIES_LANTURN
.byte 0 @ SPECIES_PICHU
.byte 0 @ SPECIES_CLEFFA
.byte 0 @ SPECIES_IGGLYBUFF
.byte 0 @ SPECIES_TOGEPI
.byte 0 @ SPECIES_TOGETIC
.byte 0 @ SPECIES_NATU
.byte 0 @ SPECIES_XATU
.byte 0 @ SPECIES_MAREEP
.byte 0 @ SPECIES_FLAAFFY
.byte 0 @ SPECIES_AMPHAROS
.byte 0 @ SPECIES_BELLOSSOM
.byte 0 @ SPECIES_MARILL
.byte 0 @ SPECIES_AZUMARILL
.byte 0 @ SPECIES_SUDOWOODO
.byte 0 @ SPECIES_POLITOED
.byte 11 @ SPECIES_HOPPIP
.byte 12 @ SPECIES_SKIPLOOM
.byte 9 @ SPECIES_JUMPLUFF
.byte 0 @ SPECIES_AIPOM
.byte 0 @ SPECIES_SUNKERN
.byte 0 @ SPECIES_SUNFLORA
.byte 8 @ SPECIES_YANMA
.byte 0 @ SPECIES_WOOPER
.byte 0 @ SPECIES_QUAGSIRE
.byte 0 @ SPECIES_ESPEON
.byte 0 @ SPECIES_UMBREON
.byte 0 @ SPECIES_MURKROW
.byte 0 @ SPECIES_SLOWKING
.byte 8 @ SPECIES_MISDREAVUS
.byte 8 @ SPECIES_UNOWN
.byte 0 @ SPECIES_WOBBUFFET
.byte 0 @ SPECIES_GIRAFARIG
.byte 0 @ SPECIES_PINECO
.byte 0 @ SPECIES_FORRETRESS
.byte 0 @ SPECIES_DUNSPARCE
.byte 6 @ SPECIES_GLIGAR
.byte 0 @ SPECIES_STEELIX
.byte 0 @ SPECIES_SNUBBULL
.byte 0 @ SPECIES_GRANBULL
.byte 0 @ SPECIES_QWILFISH
.byte 0 @ SPECIES_SCIZOR
.byte 0 @ SPECIES_SHUCKLE
.byte 0 @ SPECIES_HERACROSS
.byte 0 @ SPECIES_SNEASEL
.byte 0 @ SPECIES_TEDDIURSA
.byte 0 @ SPECIES_URSARING
.byte 0 @ SPECIES_SLUGMA
.byte 0 @ SPECIES_MAGCARGO
.byte 0 @ SPECIES_SWINUB
.byte 0 @ SPECIES_PILOSWINE
.byte 0 @ SPECIES_CORSOLA
.byte 0 @ SPECIES_REMORAID
.byte 0 @ SPECIES_OCTILLERY
.byte 0 @ SPECIES_DELIBIRD
.byte 0 @ SPECIES_MANTINE
.byte 0 @ SPECIES_SKARMORY
.byte 0 @ SPECIES_HOUNDOUR
.byte 0 @ SPECIES_HOUNDOOM
.byte 0 @ SPECIES_KINGDRA
.byte 0 @ SPECIES_PHANPY
.byte 0 @ SPECIES_DONPHAN
.byte 0 @ SPECIES_PORYGON2
.byte 0 @ SPECIES_STANTLER
.byte 0 @ SPECIES_SMEARGLE
.byte 0 @ SPECIES_TYROGUE
.byte 0 @ SPECIES_HITMONTOP
.byte 0 @ SPECIES_SMOOCHUM
.byte 0 @ SPECIES_ELEKID
.byte 0 @ SPECIES_MAGBY
.byte 0 @ SPECIES_MILTANK
.byte 0 @ SPECIES_BLISSEY
.byte 0 @ SPECIES_RAIKOU
.byte 0 @ SPECIES_ENTEI
.byte 0 @ SPECIES_SUICUNE
.byte 0 @ SPECIES_LARVITAR
.byte 0 @ SPECIES_PUPITAR
.byte 0 @ SPECIES_TYRANITAR
.byte 6 @ SPECIES_LUGIA
.byte 6 @ SPECIES_HO_OH
.byte 15 @ SPECIES_CELEBI
.byte 0 @ 252
.byte 0 @ 253
.byte 0 @ 254
.byte 0 @ 255
.byte 0 @ 256
.byte 0 @ 257
.byte 0 @ 258
.byte 0 @ 259
.byte 0 @ 260
.byte 0 @ 261
.byte 0 @ 262
.byte 0 @ 263
.byte 0 @ 264
.byte 0 @ 265
.byte 0 @ 266
.byte 0 @ 267
.byte 0 @ 268
.byte 0 @ 269
.byte 0 @ 270
.byte 0 @ 271
.byte 0 @ 272
.byte 0 @ 273
.byte 0 @ 274
.byte 0 @ 275
.byte 0 @ 276
.byte 0 @ SPECIES_TREECKO
.byte 0 @ SPECIES_GROVYLE
.byte 0 @ SPECIES_SCEPTILE
.byte 0 @ SPECIES_TORCHIC
.byte 0 @ SPECIES_COMBUSKEN
.byte 0 @ SPECIES_BLAZIKEN
.byte 0 @ SPECIES_MUDKIP
.byte 0 @ SPECIES_MARSHTOMP
.byte 0 @ SPECIES_SWAMPERT
.byte 0 @ SPECIES_POOCHYENA
.byte 0 @ SPECIES_MIGHTYENA
.byte 0 @ SPECIES_ZIGZAGOON
.byte 0 @ SPECIES_LINOONE
.byte 0 @ SPECIES_WURMPLE
.byte 0 @ SPECIES_SILCOON
.byte 8 @ SPECIES_BEAUTIFLY
.byte 0 @ SPECIES_CASCOON
.byte 10 @ SPECIES_DUSTOX
.byte 0 @ SPECIES_LOTAD
.byte 0 @ SPECIES_LOMBRE
.byte 0 @ SPECIES_LUDICOLO
.byte 0 @ SPECIES_SEEDOT
.byte 0 @ SPECIES_NUZLEAF
.byte 0 @ SPECIES_SHIFTRY
.byte 0 @ SPECIES_NINCADA
.byte 10 @ SPECIES_NINJASK
.byte 8 @ SPECIES_SHEDINJA
.byte 0 @ SPECIES_TAILLOW
.byte 0 @ SPECIES_SWELLOW
.byte 0 @ SPECIES_SHROOMISH
.byte 0 @ SPECIES_BRELOOM
.byte 0 @ SPECIES_SPINDA
.byte 16 @ SPECIES_WINGULL
.byte 8 @ SPECIES_PELIPPER
.byte 0 @ SPECIES_SURSKIT
.byte 10 @ SPECIES_MASQUERAIN
.byte 0 @ SPECIES_WAILMER
.byte 0 @ SPECIES_WAILORD
.byte 0 @ SPECIES_SKITTY
.byte 0 @ SPECIES_DELCATTY
.byte 0 @ SPECIES_KECLEON
.byte 4 @ SPECIES_BALTOY
.byte 10 @ SPECIES_CLAYDOL
.byte 0 @ SPECIES_NOSEPASS
.byte 0 @ SPECIES_TORKOAL
.byte 0 @ SPECIES_SABLEYE
.byte 0 @ SPECIES_BARBOACH
.byte 0 @ SPECIES_WHISCASH
.byte 0 @ SPECIES_LUVDISC
.byte 0 @ SPECIES_CORPHISH
.byte 0 @ SPECIES_CRAWDAUNT
.byte 0 @ SPECIES_FEEBAS
.byte 0 @ SPECIES_MILOTIC
.byte 0 @ SPECIES_CARVANHA
.byte 0 @ SPECIES_SHARPEDO
.byte 0 @ SPECIES_TRAPINCH
.byte 0 @ SPECIES_VIBRAVA
.byte 7 @ SPECIES_FLYGON
.byte 0 @ SPECIES_MAKUHITA
.byte 0 @ SPECIES_HARIYAMA
.byte 0 @ SPECIES_ELECTRIKE
.byte 0 @ SPECIES_MANECTRIC
.byte 0 @ SPECIES_NUMEL
.byte 0 @ SPECIES_CAMERUPT
.byte 0 @ SPECIES_SPHEAL
.byte 0 @ SPECIES_SEALEO
.byte 0 @ SPECIES_WALREIN
.byte 0 @ SPECIES_CACNEA
.byte 0 @ SPECIES_CACTURNE
.byte 0 @ SPECIES_SNORUNT
.byte 12 @ SPECIES_GLALIE
.byte 13 @ SPECIES_LUNATONE
.byte 4 @ SPECIES_SOLROCK
.byte 0 @ SPECIES_AZURILL
.byte 0 @ SPECIES_SPOINK
.byte 0 @ SPECIES_GRUMPIG
.byte 0 @ SPECIES_PLUSLE
.byte 0 @ SPECIES_MINUN
.byte 0 @ SPECIES_MAWILE
.byte 0 @ SPECIES_MEDITITE
.byte 0 @ SPECIES_MEDICHAM
.byte 12 @ SPECIES_SWABLU
.byte 8 @ SPECIES_ALTARIA
.byte 0 @ SPECIES_WYNAUT
.byte 9 @ SPECIES_DUSKULL
.byte 0 @ SPECIES_DUSCLOPS
.byte 0 @ SPECIES_ROSELIA
.byte 0 @ SPECIES_SLAKOTH
.byte 0 @ SPECIES_VIGOROTH
.byte 0 @ SPECIES_SLAKING
.byte 0 @ SPECIES_GULPIN
.byte 0 @ SPECIES_SWALOT
.byte 0 @ SPECIES_TROPIUS
.byte 0 @ SPECIES_WHISMUR
.byte 0 @ SPECIES_LOUDRED
.byte 0 @ SPECIES_EXPLOUD
.byte 0 @ SPECIES_CLAMPERL
.byte 0 @ SPECIES_HUNTAIL
.byte 0 @ SPECIES_GOREBYSS
.byte 0 @ SPECIES_ABSOL
.byte 12 @ SPECIES_SHUPPET
.byte 8 @ SPECIES_BANETTE
.byte 0 @ SPECIES_SEVIPER
.byte 0 @ SPECIES_ZANGOOSE
.byte 0 @ SPECIES_RELICANTH
.byte 0 @ SPECIES_ARON
.byte 0 @ SPECIES_LAIRON
.byte 0 @ SPECIES_AGGRON
.byte 16 @ SPECIES_CASTFORM
.byte 0 @ SPECIES_VOLBEAT
.byte 0 @ SPECIES_ILLUMISE
.byte 0 @ SPECIES_LILEEP
.byte 0 @ SPECIES_CRADILY
.byte 0 @ SPECIES_ANORITH
.byte 0 @ SPECIES_ARMALDO
.byte 0 @ SPECIES_RALTS
.byte 0 @ SPECIES_KIRLIA
.byte 0 @ SPECIES_GARDEVOIR
.byte 0 @ SPECIES_BAGON
.byte 0 @ SPECIES_SHELGON
.byte 0 @ SPECIES_SALAMENCE
.byte 8 @ SPECIES_BELDUM
.byte 0 @ SPECIES_METANG
.byte 0 @ SPECIES_METAGROSS
.byte 0 @ SPECIES_REGIROCK
.byte 0 @ SPECIES_REGICE
.byte 0 @ SPECIES_REGISTEEL
.byte 0 @ SPECIES_KYOGRE
.byte 0 @ SPECIES_GROUDON
.byte 6 @ SPECIES_RAYQUAZA
.byte 6 @ SPECIES_LATIAS
.byte 6 @ SPECIES_LATIOS
.byte 12 @ SPECIES_JIRACHI
.byte 8 @ SPECIES_DEOXYS
.byte 12 @ SPECIES_CHIMECHO

View File

@ -5,4 +5,22 @@
.align 2, 0
sFanfares:: @ 85248BC
.incbin "baserom.gba", 0x5248bc, 0x48
@ song number, duration
.2byte 0x016f, 0x0050
.2byte 0x0172, 0x00a0
.2byte 0x0173, 0x00dc
.2byte 0x0174, 0x00dc
.2byte 0x0170, 0x00a0
.2byte 0x0171, 0x0154
.2byte 0x017a, 0x00b4
.2byte 0x0183, 0x0078
.2byte 0x0184, 0x02c6
.2byte 0x0185, 0x00fa
.2byte 0x0186, 0x0096
.2byte 0x0187, 0x00a0
.2byte 0x0226, 0x01c2
.2byte 0x0212, 0x00aa
.2byte 0x0211, 0x00c4
.2byte 0x01cb, 0x0139
.2byte 0x01d2, 0x013e
.2byte 0x01cc, 0x0087

View File

@ -1,11 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_085507B4:: @ 85507B4
.incbin "baserom.gba", 0x5507b4, 0x18
gUnknown_085507CC:: @ 85507CC
.incbin "baserom.gba", 0x5507cc, 0x18

View File

@ -207,10 +207,10 @@ gUnknown_08C2EA9C:: @ 8C2EA9C
.incbin "baserom.gba", 0xc2ea9c, 0xf6c
@ 8C2FA08
.include "data/graphics/pokemon/mon_graphics.inc"
.include "data/graphics/pokemon/graphics.inc"
@ 8D51DC8
.include "data/graphics/trainers/trainer_graphics.inc"
.include "data/graphics/trainers/graphics.inc"
.align 2
gMonIcon_QuestionMark:: @ 8D774D0
@ -230,19 +230,82 @@ gUnknown_08D77AE4:: @ 8D77AE4
.incbin "baserom.gba", 0xd77ae4, 0x28
gUnknown_08D77B0C:: @ 8D77B0C
.incbin "baserom.gba", 0xd77b0c, 0x25fc
.incbin "baserom.gba", 0xd77b0c, 0x25c
gUnknown_08D77D68:: @ 8D77D68
.incbin "baserom.gba", 0xd77d68, 0x5b0
gUnknown_08D78318:: @ 8D78318
.incbin "baserom.gba", 0xd78318, 0x38
gUnknown_08D78350:: @ 8D78350
.incbin "baserom.gba", 0xd78350, 0x2b0
gUnknown_08D78600:: @ 8D78600
.incbin "baserom.gba", 0xd78600, 0x678
gUnknown_08D78C78:: @ 8D78C78
.incbin "baserom.gba", 0xd78C78, 0x40
gUnknown_08D78CB8:: @ 8D78CB8
.incbin "baserom.gba", 0xd78CB8, 0x2b0
gUnknown_08D78F68:: @ 8D78F68
.incbin "baserom.gba", 0xd78f68, 0x5f8
gUnknown_08D79560:: @ 8D79560
.incbin "baserom.gba", 0xd79560, 0x48
gUnknown_08D795A8:: @ 8D795A8
.incbin "baserom.gba", 0xd795A8, 0x2b0
gUnknown_08D79858:: @ 8D79858
.incbin "baserom.gba", 0xd79858, 0x5b8
gUnknown_08D79E10:: @ 8D79E10
.incbin "baserom.gba", 0xd79E10, 0x48
gUnknown_08D79E58:: @ 8D79E58
.incbin "baserom.gba", 0xd79e58, 0x2b0
gUnknown_08D7A108:: @ 8D7A108
.incbin "baserom.gba", 0xd7a108, 0x618
.incbin "baserom.gba", 0xd7a108, 0x5d4
gUnknown_08D7A6DC:: @ 8D7A6DC
.incbin "baserom.gba", 0xd7a6DC, 0x44
gUnknown_08D7A720:: @ 8D7A720
.incbin "baserom.gba", 0xd7a720, 0x13f4
.incbin "baserom.gba", 0xd7a720, 0x2b0
gUnknown_08D7A9D0:: @ 8D7A9D0
.incbin "baserom.gba", 0xd7a9D0, 0x5a8
gUnknown_08D7AF78:: @ 8D7AF78
.incbin "baserom.gba", 0xd7af78, 0x40
gUnknown_08D7AFB8:: @ 8D7AFB8
.incbin "baserom.gba", 0xd7aFB8, 0x2b0
gUnknown_08D7B268:: @ 8D7B268
.incbin "baserom.gba", 0xd7b268, 0x5c0
gUnknown_08D7B828:: @ 8D7B828
.incbin "baserom.gba", 0xd7b828, 0x3c
gUnknown_08D7B864:: @ 8D7B864
.incbin "baserom.gba", 0xd7b864, 0x2b0
gUnknown_08D7BB14:: @ 8D7BB14
.incbin "baserom.gba", 0xd7bb14, 0x640
.incbin "baserom.gba", 0xd7bb14, 0x5f8
gUnknown_08D7C10C:: @ 8D7C10C
.incbin "baserom.gba", 0xd7c10c, 0x48
gUnknown_08D7C154:: @ 8D7C154
.incbin "baserom.gba", 0xd7c154, 0x2ec
.incbin "baserom.gba", 0xd7c154, 0x2b0
gUnknown_08D7C404:: @ 8D7C404
.incbin "baserom.gba", 0xd7c404, 0x3c
gUnknown_08D7C440:: @ 8D7C440
.incbin "baserom.gba", 0xd7c440, 0x5ac
@ -263,7 +326,10 @@ gUnknown_08D7D590:: @ 8D7D590
.incbin "baserom.gba", 0xd7d590, 0x674
gUnknown_08D7DC04:: @ 8D7DC04
.incbin "baserom.gba", 0xd7dc04, 0x2f0
.incbin "baserom.gba", 0xd7dc04, 0x2b0
gUnknown_08D7DEB4:: @ 8D7DEB4
.incbin "baserom.gba", 0xd7deb4, 0x40
gUnknown_08D7DEF4:: @ 8D7DEF4
.incbin "baserom.gba", 0xd7def4, 0x3c
@ -299,13 +365,49 @@ gUnknown_08D7E1F8:: @ 8D7E1F8
.incbin "baserom.gba", 0xd7e1f8, 0x3c
gUnknown_08D7E234:: @ 8D7E234
.incbin "baserom.gba", 0xd7e234, 0x17c4
.incbin "baserom.gba", 0xd7e234, 0x4c
gUnknown_08D7E280:: @ 8D7E280
.incbin "baserom.gba", 0xd7e280, 0x588
gUnknown_08D7E808:: @ 8D7E808
.incbin "baserom.gba", 0xd7e808, 0x1bc
gUnknown_08D7E9C4:: @ 8D7E9C4
.incbin "baserom.gba", 0xd7e9C4, 0x710
gUnknown_08D7F0D4:: @ 8D7F0D4
.incbin "baserom.gba", 0xd7F0D4, 0x238
gUnknown_08D7F30C:: @ 8D7F30C
.incbin "baserom.gba", 0xd7F30c, 0x544
gUnknown_08D7F850:: @ 8D7F850
.incbin "baserom.gba", 0xd7F850, 0x1a8
gUnknown_08D7F9F8:: @ 8D7F9F8
.incbin "baserom.gba", 0xd7f9f8, 0x4cc
gUnknown_08D7FEC4:: @ 8D7FEC4
.incbin "baserom.gba", 0xd7fec4, 0x174c
.incbin "baserom.gba", 0xd7fec4, 0x190
gUnknown_08D80054:: @ 8D80054
.incbin "baserom.gba", 0xd80054, 0x60c
gUnknown_08D80660:: @ 8D80660
.incbin "baserom.gba", 0xd80660, 0x1a4
gUnknown_08D80804:: @ 8D80804
.incbin "baserom.gba", 0xd80804, 0x54c
gUnknown_08D80D50:: @ 8D80D50
.incbin "baserom.gba", 0xd80d50, 0x14C
gUnknown_08D80E9C:: @ 8D80E9C
.incbin "baserom.gba", 0xd80e9c, 0x5e0
gUnknown_08D8147C:: @ 8D8147C
.incbin "baserom.gba", 0xd8147C, 0x194
gUnknown_08D81610:: @ 8D81610
.incbin "baserom.gba", 0xd81610, 0x81c

View File

@ -0,0 +1,412 @@
gMonAnimationDelayTable:: @ 8329B87
.byte 0x00 @ SPECIES_BULBASAUR
.byte 0x00 @ SPECIES_IVYSAUR
.byte 0x00 @ SPECIES_VENUSAUR
.byte 0x00 @ SPECIES_CHARMANDER
.byte 0x00 @ SPECIES_CHARMELEON
.byte 0x00 @ SPECIES_CHARIZARD
.byte 0x00 @ SPECIES_SQUIRTLE
.byte 0x00 @ SPECIES_WARTORTLE
.byte 0x32 @ SPECIES_BLASTOISE
.byte 0x00 @ SPECIES_CATERPIE
.byte 0x00 @ SPECIES_METAPOD
.byte 0x00 @ SPECIES_BUTTERFREE
.byte 0x0a @ SPECIES_WEEDLE
.byte 0x14 @ SPECIES_KAKUNA
.byte 0x23 @ SPECIES_BEEDRILL
.byte 0x00 @ SPECIES_PIDGEY
.byte 0x19 @ SPECIES_PIDGEOTTO
.byte 0x00 @ SPECIES_PIDGEOT
.byte 0x00 @ SPECIES_RATTATA
.byte 0x00 @ SPECIES_RATICATE
.byte 0x00 @ SPECIES_SPEAROW
.byte 0x02 @ SPECIES_FEAROW
.byte 0x1e @ SPECIES_EKANS
.byte 0x00 @ SPECIES_ARBOK
.byte 0x00 @ SPECIES_PIKACHU
.byte 0x00 @ SPECIES_RAICHU
.byte 0x00 @ SPECIES_SANDSHREW
.byte 0x00 @ SPECIES_SANDSLASH
.byte 0x1c @ SPECIES_NIDORAN_F
.byte 0x00 @ SPECIES_NIDORINA
.byte 0x00 @ SPECIES_NIDOQUEEN
.byte 0x00 @ SPECIES_NIDORAN_M
.byte 0x00 @ SPECIES_NIDORINO
.byte 0x19 @ SPECIES_NIDOKING
.byte 0x00 @ SPECIES_CLEFAIRY
.byte 0x00 @ SPECIES_CLEFABLE
.byte 0x00 @ SPECIES_VULPIX
.byte 0x00 @ SPECIES_NINETALES
.byte 0x00 @ SPECIES_JIGGLYPUFF
.byte 0x00 @ SPECIES_WIGGLYTUFF
.byte 0x00 @ SPECIES_ZUBAT
.byte 0x00 @ SPECIES_GOLBAT
.byte 0x00 @ SPECIES_ODDISH
.byte 0x00 @ SPECIES_GLOOM
.byte 0x00 @ SPECIES_VILEPLUME
.byte 0x0a @ SPECIES_PARAS
.byte 0x2d @ SPECIES_PARASECT
.byte 0x14 @ SPECIES_VENONAT
.byte 0x00 @ SPECIES_VENOMOTH
.byte 0x19 @ SPECIES_DIGLETT
.byte 0x23 @ SPECIES_DUGTRIO
.byte 0x28 @ SPECIES_MEOWTH
.byte 0x14 @ SPECIES_PERSIAN
.byte 0x00 @ SPECIES_PSYDUCK
.byte 0x00 @ SPECIES_GOLDUCK
.byte 0x14 @ SPECIES_MANKEY
.byte 0x00 @ SPECIES_PRIMEAPE
.byte 0x1e @ SPECIES_GROWLITHE
.byte 0x28 @ SPECIES_ARCANINE
.byte 0x00 @ SPECIES_POLIWAG
.byte 0x05 @ SPECIES_POLIWHIRL
.byte 0x00 @ SPECIES_POLIWRATH
.byte 0x00 @ SPECIES_ABRA
.byte 0x00 @ SPECIES_KADABRA
.byte 0x00 @ SPECIES_ALAKAZAM
.byte 0x00 @ SPECIES_MACHOP
.byte 0x00 @ SPECIES_MACHOKE
.byte 0x00 @ SPECIES_MACHAMP
.byte 0x00 @ SPECIES_BELLSPROUT
.byte 0x03 @ SPECIES_WEEPINBELL
.byte 0x00 @ SPECIES_VICTREEBEL
.byte 0x00 @ SPECIES_TENTACOOL
.byte 0x00 @ SPECIES_TENTACRUEL
.byte 0x00 @ SPECIES_GEODUDE
.byte 0x00 @ SPECIES_GRAVELER
.byte 0x00 @ SPECIES_GOLEM
.byte 0x00 @ SPECIES_PONYTA
.byte 0x00 @ SPECIES_RAPIDASH
.byte 0x00 @ SPECIES_SLOWPOKE
.byte 0x00 @ SPECIES_SLOWBRO
.byte 0x00 @ SPECIES_MAGNEMITE
.byte 0x00 @ SPECIES_MAGNETON
.byte 0x00 @ SPECIES_FARFETCH_D
.byte 0x00 @ SPECIES_DODUO
.byte 0x00 @ SPECIES_DODRIO
.byte 0x00 @ SPECIES_SEEL
.byte 0x00 @ SPECIES_DEWGONG
.byte 0x00 @ SPECIES_GRIMER
.byte 0x2d @ SPECIES_MUK
.byte 0x14 @ SPECIES_SHELLDER
.byte 0x00 @ SPECIES_CLOYSTER
.byte 0x00 @ SPECIES_GASTLY
.byte 0x17 @ SPECIES_HAUNTER
.byte 0x00 @ SPECIES_GENGAR
.byte 0x00 @ SPECIES_ONIX
.byte 0x30 @ SPECIES_DROWZEE
.byte 0x28 @ SPECIES_HYPNO
.byte 0x00 @ SPECIES_KRABBY
.byte 0x00 @ SPECIES_KINGLER
.byte 0x00 @ SPECIES_VOLTORB
.byte 0x00 @ SPECIES_ELECTRODE
.byte 0x00 @ SPECIES_EXEGGCUTE
.byte 0x00 @ SPECIES_EXEGGUTOR
.byte 0x00 @ SPECIES_CUBONE
.byte 0x00 @ SPECIES_MAROWAK
.byte 0x00 @ SPECIES_HITMONLEE
.byte 0x19 @ SPECIES_HITMONCHAN
.byte 0x00 @ SPECIES_LICKITUNG
.byte 0x00 @ SPECIES_KOFFING
.byte 0x00 @ SPECIES_WEEZING
.byte 0x00 @ SPECIES_RHYHORN
.byte 0x00 @ SPECIES_RHYDON
.byte 0x00 @ SPECIES_CHANSEY
.byte 0x00 @ SPECIES_TANGELA
.byte 0x00 @ SPECIES_KANGASKHAN
.byte 0x00 @ SPECIES_HORSEA
.byte 0x00 @ SPECIES_SEADRA
.byte 0x00 @ SPECIES_GOLDEEN
.byte 0x00 @ SPECIES_SEAKING
.byte 0x00 @ SPECIES_STARYU
.byte 0x00 @ SPECIES_STARMIE
.byte 0x00 @ SPECIES_MR_MIME
.byte 0x0a @ SPECIES_SCYTHER
.byte 0x00 @ SPECIES_JYNX
.byte 0x00 @ SPECIES_ELECTABUZZ
.byte 0x00 @ SPECIES_MAGMAR
.byte 0x00 @ SPECIES_PINSIR
.byte 0x0a @ SPECIES_TAUROS
.byte 0x00 @ SPECIES_MAGIKARP
.byte 0x00 @ SPECIES_GYARADOS
.byte 0x00 @ SPECIES_LAPRAS
.byte 0x00 @ SPECIES_DITTO
.byte 0x00 @ SPECIES_EEVEE
.byte 0x00 @ SPECIES_VAPOREON
.byte 0x00 @ SPECIES_JOLTEON
.byte 0x00 @ SPECIES_FLAREON
.byte 0x00 @ SPECIES_PORYGON
.byte 0x00 @ SPECIES_OMANYTE
.byte 0x00 @ SPECIES_OMASTAR
.byte 0x00 @ SPECIES_KABUTO
.byte 0x00 @ SPECIES_KABUTOPS
.byte 0x00 @ SPECIES_AERODACTYL
.byte 0x00 @ SPECIES_SNORLAX
.byte 0x00 @ SPECIES_ARTICUNO
.byte 0x00 @ SPECIES_ZAPDOS
.byte 0x00 @ SPECIES_MOLTRES
.byte 0x00 @ SPECIES_DRATINI
.byte 0x00 @ SPECIES_DRAGONAIR
.byte 0x00 @ SPECIES_DRAGONITE
.byte 0x00 @ SPECIES_MEWTWO
.byte 0x00 @ SPECIES_MEW
.byte 0x00 @ SPECIES_CHIKORITA
.byte 0x00 @ SPECIES_BAYLEEF
.byte 0x00 @ SPECIES_MEGANIUM
.byte 0x00 @ SPECIES_CYNDAQUIL
.byte 0x00 @ SPECIES_QUILAVA
.byte 0x14 @ SPECIES_TYPHLOSION
.byte 0x00 @ SPECIES_TOTODILE
.byte 0x00 @ SPECIES_CROCONAW
.byte 0x05 @ SPECIES_FERALIGATR
.byte 0x00 @ SPECIES_SENTRET
.byte 0x00 @ SPECIES_FURRET
.byte 0x00 @ SPECIES_HOOTHOOT
.byte 0x00 @ SPECIES_NOCTOWL
.byte 0x00 @ SPECIES_LEDYBA
.byte 0x00 @ SPECIES_LEDIAN
.byte 0x00 @ SPECIES_SPINARAK
.byte 0x00 @ SPECIES_ARIADOS
.byte 0x00 @ SPECIES_CROBAT
.byte 0x00 @ SPECIES_CHINCHOU
.byte 0x00 @ SPECIES_LANTURN
.byte 0x00 @ SPECIES_PICHU
.byte 0x00 @ SPECIES_CLEFFA
.byte 0x00 @ SPECIES_IGGLYBUFF
.byte 0x00 @ SPECIES_TOGEPI
.byte 0x00 @ SPECIES_TOGETIC
.byte 0x1e @ SPECIES_NATU
.byte 0x00 @ SPECIES_XATU
.byte 0x32 @ SPECIES_MAREEP
.byte 0x00 @ SPECIES_FLAAFFY
.byte 0x0a @ SPECIES_AMPHAROS
.byte 0x00 @ SPECIES_BELLOSSOM
.byte 0x00 @ SPECIES_MARILL
.byte 0x00 @ SPECIES_AZUMARILL
.byte 0x00 @ SPECIES_SUDOWOODO
.byte 0x28 @ SPECIES_POLITOED
.byte 0x00 @ SPECIES_HOPPIP
.byte 0x00 @ SPECIES_SKIPLOOM
.byte 0x00 @ SPECIES_JUMPLUFF
.byte 0x00 @ SPECIES_AIPOM
.byte 0x00 @ SPECIES_SUNKERN
.byte 0x00 @ SPECIES_SUNFLORA
.byte 0x00 @ SPECIES_YANMA
.byte 0x00 @ SPECIES_WOOPER
.byte 0x00 @ SPECIES_QUAGSIRE
.byte 0x00 @ SPECIES_ESPEON
.byte 0x00 @ SPECIES_UMBREON
.byte 0x00 @ SPECIES_MURKROW
.byte 0x00 @ SPECIES_SLOWKING
.byte 0x00 @ SPECIES_MISDREAVUS
.byte 0x00 @ SPECIES_UNOWN
.byte 0x00 @ SPECIES_WOBBUFFET
.byte 0x00 @ SPECIES_GIRAFARIG
.byte 0x00 @ SPECIES_PINECO
.byte 0x00 @ SPECIES_FORRETRESS
.byte 0x0a @ SPECIES_DUNSPARCE
.byte 0x00 @ SPECIES_GLIGAR
.byte 0x2d @ SPECIES_STEELIX
.byte 0x00 @ SPECIES_SNUBBULL
.byte 0x00 @ SPECIES_GRANBULL
.byte 0x27 @ SPECIES_QWILFISH
.byte 0x13 @ SPECIES_SCIZOR
.byte 0x00 @ SPECIES_SHUCKLE
.byte 0x00 @ SPECIES_HERACROSS
.byte 0x00 @ SPECIES_SNEASEL
.byte 0x00 @ SPECIES_TEDDIURSA
.byte 0x00 @ SPECIES_URSARING
.byte 0x00 @ SPECIES_SLUGMA
.byte 0x00 @ SPECIES_MAGCARGO
.byte 0x00 @ SPECIES_SWINUB
.byte 0x00 @ SPECIES_PILOSWINE
.byte 0x00 @ SPECIES_CORSOLA
.byte 0x00 @ SPECIES_REMORAID
.byte 0x14 @ SPECIES_OCTILLERY
.byte 0x00 @ SPECIES_DELIBIRD
.byte 0x00 @ SPECIES_MANTINE
.byte 0x00 @ SPECIES_SKARMORY
.byte 0x00 @ SPECIES_HOUNDOUR
.byte 0x00 @ SPECIES_HOUNDOOM
.byte 0x00 @ SPECIES_KINGDRA
.byte 0x00 @ SPECIES_PHANPY
.byte 0x00 @ SPECIES_DONPHAN
.byte 0x00 @ SPECIES_PORYGON2
.byte 0x00 @ SPECIES_STANTLER
.byte 0x00 @ SPECIES_SMEARGLE
.byte 0x00 @ SPECIES_TYROGUE
.byte 0x00 @ SPECIES_HITMONTOP
.byte 0x28 @ SPECIES_SMOOCHUM
.byte 0x00 @ SPECIES_ELEKID
.byte 0x00 @ SPECIES_MAGBY
.byte 0x00 @ SPECIES_MILTANK
.byte 0x00 @ SPECIES_BLISSEY
.byte 0x00 @ SPECIES_RAIKOU
.byte 0x00 @ SPECIES_ENTEI
.byte 0x00 @ SPECIES_SUICUNE
.byte 0x00 @ SPECIES_LARVITAR
.byte 0x00 @ SPECIES_PUPITAR
.byte 0x0a @ SPECIES_TYRANITAR
.byte 0x14 @ SPECIES_LUGIA
.byte 0x00 @ SPECIES_HO_OH
.byte 0x00 @ SPECIES_CELEBI
.byte 0x00 @ 252
.byte 0x00 @ 253
.byte 0x00 @ 254
.byte 0x00 @ 255
.byte 0x00 @ 256
.byte 0x00 @ 257
.byte 0x00 @ 258
.byte 0x00 @ 259
.byte 0x00 @ 260
.byte 0x00 @ 261
.byte 0x00 @ 262
.byte 0x00 @ 263
.byte 0x00 @ 264
.byte 0x00 @ 265
.byte 0x00 @ 266
.byte 0x00 @ 267
.byte 0x00 @ 268
.byte 0x00 @ 269
.byte 0x00 @ 270
.byte 0x00 @ 271
.byte 0x00 @ 272
.byte 0x00 @ 273
.byte 0x00 @ 274
.byte 0x00 @ 275
.byte 0x00 @ 276
.byte 0x00 @ SPECIES_TREECKO
.byte 0x00 @ SPECIES_GROVYLE
.byte 0x00 @ SPECIES_SCEPTILE
.byte 0x00 @ SPECIES_TORCHIC
.byte 0x00 @ SPECIES_COMBUSKEN
.byte 0x00 @ SPECIES_BLAZIKEN
.byte 0x00 @ SPECIES_MUDKIP
.byte 0x00 @ SPECIES_MARSHTOMP
.byte 0x00 @ SPECIES_SWAMPERT
.byte 0x00 @ SPECIES_POOCHYENA
.byte 0x00 @ SPECIES_MIGHTYENA
.byte 0x00 @ SPECIES_ZIGZAGOON
.byte 0x00 @ SPECIES_LINOONE
.byte 0x00 @ SPECIES_WURMPLE
.byte 0x00 @ SPECIES_SILCOON
.byte 0x00 @ SPECIES_BEAUTIFLY
.byte 0x00 @ SPECIES_CASCOON
.byte 0x00 @ SPECIES_DUSTOX
.byte 0x00 @ SPECIES_LOTAD
.byte 0x00 @ SPECIES_LOMBRE
.byte 0x00 @ SPECIES_LUDICOLO
.byte 0x00 @ SPECIES_SEEDOT
.byte 0x00 @ SPECIES_NUZLEAF
.byte 0x00 @ SPECIES_SHIFTRY
.byte 0x00 @ SPECIES_NINCADA
.byte 0x00 @ SPECIES_NINJASK
.byte 0x00 @ SPECIES_SHEDINJA
.byte 0x00 @ SPECIES_TAILLOW
.byte 0x00 @ SPECIES_SWELLOW
.byte 0x00 @ SPECIES_SHROOMISH
.byte 0x00 @ SPECIES_BRELOOM
.byte 0x00 @ SPECIES_SPINDA
.byte 0x00 @ SPECIES_WINGULL
.byte 0x00 @ SPECIES_PELIPPER
.byte 0x00 @ SPECIES_SURSKIT
.byte 0x00 @ SPECIES_MASQUERAIN
.byte 0x00 @ SPECIES_WAILMER
.byte 0x0a @ SPECIES_WAILORD
.byte 0x00 @ SPECIES_SKITTY
.byte 0x00 @ SPECIES_DELCATTY
.byte 0x1e @ SPECIES_KECLEON
.byte 0x00 @ SPECIES_BALTOY
.byte 0x00 @ SPECIES_CLAYDOL
.byte 0x00 @ SPECIES_NOSEPASS
.byte 0x00 @ SPECIES_TORKOAL
.byte 0x00 @ SPECIES_SABLEYE
.byte 0x00 @ SPECIES_BARBOACH
.byte 0x00 @ SPECIES_WHISCASH
.byte 0x00 @ SPECIES_LUVDISC
.byte 0x00 @ SPECIES_CORPHISH
.byte 0x00 @ SPECIES_CRAWDAUNT
.byte 0x00 @ SPECIES_FEEBAS
.byte 0x2d @ SPECIES_MILOTIC
.byte 0x00 @ SPECIES_CARVANHA
.byte 0x00 @ SPECIES_SHARPEDO
.byte 0x00 @ SPECIES_TRAPINCH
.byte 0x00 @ SPECIES_VIBRAVA
.byte 0x00 @ SPECIES_FLYGON
.byte 0x00 @ SPECIES_MAKUHITA
.byte 0x00 @ SPECIES_HARIYAMA
.byte 0x00 @ SPECIES_ELECTRIKE
.byte 0x00 @ SPECIES_MANECTRIC
.byte 0x00 @ SPECIES_NUMEL
.byte 0x00 @ SPECIES_CAMERUPT
.byte 0x0f @ SPECIES_SPHEAL
.byte 0x00 @ SPECIES_SEALEO
.byte 0x00 @ SPECIES_WALREIN
.byte 0x00 @ SPECIES_CACNEA
.byte 0x00 @ SPECIES_CACTURNE
.byte 0x14 @ SPECIES_SNORUNT
.byte 0x00 @ SPECIES_GLALIE
.byte 0x00 @ SPECIES_LUNATONE
.byte 0x00 @ SPECIES_SOLROCK
.byte 0x00 @ SPECIES_AZURILL
.byte 0x00 @ SPECIES_SPOINK
.byte 0x0f @ SPECIES_GRUMPIG
.byte 0x00 @ SPECIES_PLUSLE
.byte 0x00 @ SPECIES_MINUN
.byte 0x00 @ SPECIES_MAWILE
.byte 0x00 @ SPECIES_MEDITITE
.byte 0x00 @ SPECIES_MEDICHAM
.byte 0x00 @ SPECIES_SWABLU
.byte 0x00 @ SPECIES_ALTARIA
.byte 0x0f @ SPECIES_WYNAUT
.byte 0x00 @ SPECIES_DUSKULL
.byte 0x1e @ SPECIES_DUSCLOPS
.byte 0x00 @ SPECIES_ROSELIA
.byte 0x00 @ SPECIES_SLAKOTH
.byte 0x00 @ SPECIES_VIGOROTH
.byte 0x00 @ SPECIES_SLAKING
.byte 0x00 @ SPECIES_GULPIN
.byte 0x00 @ SPECIES_SWALOT
.byte 0x00 @ SPECIES_TROPIUS
.byte 0x00 @ SPECIES_WHISMUR
.byte 0x00 @ SPECIES_LOUDRED
.byte 0x00 @ SPECIES_EXPLOUD
.byte 0x00 @ SPECIES_CLAMPERL
.byte 0x00 @ SPECIES_HUNTAIL
.byte 0x00 @ SPECIES_GOREBYSS
.byte 0x2d @ SPECIES_ABSOL
.byte 0x00 @ SPECIES_SHUPPET
.byte 0x00 @ SPECIES_BANETTE
.byte 0x00 @ SPECIES_SEVIPER
.byte 0x00 @ SPECIES_ZANGOOSE
.byte 0x00 @ SPECIES_RELICANTH
.byte 0x00 @ SPECIES_ARON
.byte 0x00 @ SPECIES_LAIRON
.byte 0x00 @ SPECIES_AGGRON
.byte 0x00 @ SPECIES_CASTFORM
.byte 0x00 @ SPECIES_VOLBEAT
.byte 0x00 @ SPECIES_ILLUMISE
.byte 0x00 @ SPECIES_LILEEP
.byte 0x00 @ SPECIES_CRADILY
.byte 0x00 @ SPECIES_ANORITH
.byte 0x00 @ SPECIES_ARMALDO
.byte 0x00 @ SPECIES_RALTS
.byte 0x00 @ SPECIES_KIRLIA
.byte 0x00 @ SPECIES_GARDEVOIR
.byte 0x00 @ SPECIES_BAGON
.byte 0x00 @ SPECIES_SHELGON
.byte 0x46 @ SPECIES_SALAMENCE
.byte 0x00 @ SPECIES_BELDUM
.byte 0x00 @ SPECIES_METANG
.byte 0x00 @ SPECIES_METAGROSS
.byte 0x00 @ SPECIES_REGIROCK
.byte 0x00 @ SPECIES_REGICE
.byte 0x00 @ SPECIES_REGISTEEL
.byte 0x3c @ SPECIES_KYOGRE
.byte 0x00 @ SPECIES_GROUDON
.byte 0x3c @ SPECIES_RAYQUAZA
.byte 0x00 @ SPECIES_LATIAS
.byte 0x00 @ SPECIES_LATIOS
.byte 0x00 @ SPECIES_JIRACHI
.byte 0x00 @ SPECIES_DEOXYS
.byte 0x00 @ SPECIES_CHIMECHO

View File

@ -0,0 +1,412 @@
gMonFrontAnimIdsTable:: @ 83299EC
.byte 0x06 @ SPECIES_BULBASAUR
.byte 0x17 @ SPECIES_IVYSAUR
.byte 0x2f @ SPECIES_VENUSAUR
.byte 0x52 @ SPECIES_CHARMANDER
.byte 0x25 @ SPECIES_CHARMELEON
.byte 0x10 @ SPECIES_CHARIZARD
.byte 0x0b @ SPECIES_SQUIRTLE
.byte 0x13 @ SPECIES_WARTORTLE
.byte 0x19 @ SPECIES_BLASTOISE
.byte 0x0b @ SPECIES_CATERPIE
.byte 0x0b @ SPECIES_METAPOD
.byte 0x1d @ SPECIES_BUTTERFREE
.byte 0x46 @ SPECIES_WEEDLE
.byte 0x20 @ SPECIES_KAKUNA
.byte 0x02 @ SPECIES_BEEDRILL
.byte 0x47 @ SPECIES_PIDGEY
.byte 0x17 @ SPECIES_PIDGEOTTO
.byte 0x29 @ SPECIES_PIDGEOT
.byte 0x43 @ SPECIES_RATTATA
.byte 0x2b @ SPECIES_RATICATE
.byte 0x18 @ SPECIES_SPEAROW
.byte 0x2b @ SPECIES_FEAROW
.byte 0x16 @ SPECIES_EKANS
.byte 0x17 @ SPECIES_ARBOK
.byte 0x2c @ SPECIES_PIKACHU
.byte 0x17 @ SPECIES_RAICHU
.byte 0x2d @ SPECIES_SANDSHREW
.byte 0x17 @ SPECIES_SANDSLASH
.byte 0x00 @ SPECIES_NIDORAN_F
.byte 0x17 @ SPECIES_NIDORINA
.byte 0x0f @ SPECIES_NIDOQUEEN
.byte 0x09 @ SPECIES_NIDORAN_M
.byte 0x13 @ SPECIES_NIDORINO
.byte 0x0f @ SPECIES_NIDOKING
.byte 0x00 @ SPECIES_CLEFAIRY
.byte 0x4a @ SPECIES_CLEFABLE
.byte 0x17 @ SPECIES_VULPIX
.byte 0x10 @ SPECIES_NINETALES
.byte 0x48 @ SPECIES_JIGGLYPUFF
.byte 0x31 @ SPECIES_WIGGLYTUFF
.byte 0x00 @ SPECIES_ZUBAT
.byte 0x1d @ SPECIES_GOLBAT
.byte 0x00 @ SPECIES_ODDISH
.byte 0x45 @ SPECIES_GLOOM
.byte 0x49 @ SPECIES_VILEPLUME
.byte 0x46 @ SPECIES_PARAS
.byte 0x0f @ SPECIES_PARASECT
.byte 0x06 @ SPECIES_VENONAT
.byte 0x4b @ SPECIES_VENOMOTH
.byte 0x10 @ SPECIES_DIGLETT
.byte 0x4c @ SPECIES_DUGTRIO
.byte 0x52 @ SPECIES_MEOWTH
.byte 0x17 @ SPECIES_PERSIAN
.byte 0x06 @ SPECIES_PSYDUCK
.byte 0x4c @ SPECIES_GOLDUCK
.byte 0x32 @ SPECIES_MANKEY
.byte 0x48 @ SPECIES_PRIMEAPE
.byte 0x25 @ SPECIES_GROWLITHE
.byte 0x02 @ SPECIES_ARCANINE
.byte 0x00 @ SPECIES_POLIWAG
.byte 0x32 @ SPECIES_POLIWHIRL
.byte 0x19 @ SPECIES_POLIWRATH
.byte 0x31 @ SPECIES_ABRA
.byte 0x09 @ SPECIES_KADABRA
.byte 0x17 @ SPECIES_ALAKAZAM
.byte 0x00 @ SPECIES_MACHOP
.byte 0x10 @ SPECIES_MACHOKE
.byte 0x31 @ SPECIES_MACHAMP
.byte 0x17 @ SPECIES_BELLSPROUT
.byte 0x0d @ SPECIES_WEEPINBELL
.byte 0x32 @ SPECIES_VICTREEBEL
.byte 0x00 @ SPECIES_TENTACOOL
.byte 0x00 @ SPECIES_TENTACRUEL
.byte 0x48 @ SPECIES_GEODUDE
.byte 0x48 @ SPECIES_GRAVELER
.byte 0x2f @ SPECIES_GOLEM
.byte 0x20 @ SPECIES_PONYTA
.byte 0x11 @ SPECIES_RAPIDASH
.byte 0x45 @ SPECIES_SLOWPOKE
.byte 0x0b @ SPECIES_SLOWBRO
.byte 0x54 @ SPECIES_MAGNEMITE
.byte 0x2c @ SPECIES_MAGNETON
.byte 0x48 @ SPECIES_FARFETCH_D
.byte 0x4c @ SPECIES_DODUO
.byte 0x41 @ SPECIES_DODRIO
.byte 0x0b @ SPECIES_SEEL
.byte 0x45 @ SPECIES_DEWGONG
.byte 0x46 @ SPECIES_GRIMER
.byte 0x30 @ SPECIES_MUK
.byte 0x12 @ SPECIES_SHELLDER
.byte 0x1d @ SPECIES_CLOYSTER
.byte 0x15 @ SPECIES_GASTLY
.byte 0x35 @ SPECIES_HAUNTER
.byte 0x3a @ SPECIES_GENGAR
.byte 0x43 @ SPECIES_ONIX
.byte 0x4f @ SPECIES_DROWZEE
.byte 0x09 @ SPECIES_HYPNO
.byte 0x03 @ SPECIES_KRABBY
.byte 0x4b @ SPECIES_KINGLER
.byte 0x00 @ SPECIES_VOLTORB
.byte 0x00 @ SPECIES_ELECTRODE
.byte 0x46 @ SPECIES_EXEGGCUTE
.byte 0x32 @ SPECIES_EXEGGUTOR
.byte 0x48 @ SPECIES_CUBONE
.byte 0x05 @ SPECIES_MAROWAK
.byte 0x16 @ SPECIES_HITMONLEE
.byte 0x09 @ SPECIES_HITMONCHAN
.byte 0x45 @ SPECIES_LICKITUNG
.byte 0x13 @ SPECIES_KOFFING
.byte 0x04 @ SPECIES_WEEZING
.byte 0x10 @ SPECIES_RHYHORN
.byte 0x13 @ SPECIES_RHYDON
.byte 0x45 @ SPECIES_CHANSEY
.byte 0x48 @ SPECIES_TANGELA
.byte 0x17 @ SPECIES_KANGASKHAN
.byte 0x12 @ SPECIES_HORSEA
.byte 0x04 @ SPECIES_SEADRA
.byte 0x0d @ SPECIES_GOLDEEN
.byte 0x1c @ SPECIES_SEAKING
.byte 0x4e @ SPECIES_STARYU
.byte 0x12 @ SPECIES_STARMIE
.byte 0x46 @ SPECIES_MR_MIME
.byte 0x02 @ SPECIES_SCYTHER
.byte 0x17 @ SPECIES_JYNX
.byte 0x2c @ SPECIES_ELECTABUZZ
.byte 0x0f @ SPECIES_MAGMAR
.byte 0x09 @ SPECIES_PINSIR
.byte 0x19 @ SPECIES_TAUROS
.byte 0x05 @ SPECIES_MAGIKARP
.byte 0x48 @ SPECIES_GYARADOS
.byte 0x17 @ SPECIES_LAPRAS
.byte 0x01 @ SPECIES_DITTO
.byte 0x17 @ SPECIES_EEVEE
.byte 0x17 @ SPECIES_VAPOREON
.byte 0x00 @ SPECIES_JOLTEON
.byte 0x17 @ SPECIES_FLAREON
.byte 0x52 @ SPECIES_PORYGON
.byte 0x51 @ SPECIES_OMANYTE
.byte 0x09 @ SPECIES_OMASTAR
.byte 0x1d @ SPECIES_KABUTO
.byte 0x0f @ SPECIES_KABUTOPS
.byte 0x47 @ SPECIES_AERODACTYL
.byte 0x0b @ SPECIES_SNORLAX
.byte 0x09 @ SPECIES_ARTICUNO
.byte 0x2c @ SPECIES_ZAPDOS
.byte 0x45 @ SPECIES_MOLTRES
.byte 0x00 @ SPECIES_DRATINI
.byte 0x10 @ SPECIES_DRAGONAIR
.byte 0x47 @ SPECIES_DRAGONITE
.byte 0x09 @ SPECIES_MEWTWO
.byte 0x0d @ SPECIES_MEW
.byte 0x00 @ SPECIES_CHIKORITA
.byte 0x00 @ SPECIES_BAYLEEF
.byte 0x17 @ SPECIES_MEGANIUM
.byte 0x52 @ SPECIES_CYNDAQUIL
.byte 0x17 @ SPECIES_QUILAVA
.byte 0x10 @ SPECIES_TYPHLOSION
.byte 0x31 @ SPECIES_TOTODILE
.byte 0x0f @ SPECIES_CROCONAW
.byte 0x0f @ SPECIES_FERALIGATR
.byte 0x00 @ SPECIES_SENTRET
.byte 0x32 @ SPECIES_FURRET
.byte 0x47 @ SPECIES_HOOTHOOT
.byte 0x17 @ SPECIES_NOCTOWL
.byte 0x52 @ SPECIES_LEDYBA
.byte 0x47 @ SPECIES_LEDIAN
.byte 0x4f @ SPECIES_SPINARAK
.byte 0x0f @ SPECIES_ARIADOS
.byte 0x00 @ SPECIES_CROBAT
.byte 0x45 @ SPECIES_CHINCHOU
.byte 0x51 @ SPECIES_LANTURN
.byte 0x1e @ SPECIES_PICHU
.byte 0x52 @ SPECIES_CLEFFA
.byte 0x0c @ SPECIES_IGGLYBUFF
.byte 0x0b @ SPECIES_TOGEPI
.byte 0x00 @ SPECIES_TOGETIC
.byte 0x31 @ SPECIES_NATU
.byte 0x09 @ SPECIES_XATU
.byte 0x00 @ SPECIES_MAREEP
.byte 0x1e @ SPECIES_FLAAFFY
.byte 0x2c @ SPECIES_AMPHAROS
.byte 0x0b @ SPECIES_BELLOSSOM
.byte 0x00 @ SPECIES_MARILL
.byte 0x4a @ SPECIES_AZUMARILL
.byte 0x46 @ SPECIES_SUDOWOODO
.byte 0x32 @ SPECIES_POLITOED
.byte 0x1c @ SPECIES_HOPPIP
.byte 0x18 @ SPECIES_SKIPLOOM
.byte 0x51 @ SPECIES_JUMPLUFF
.byte 0x32 @ SPECIES_AIPOM
.byte 0x52 @ SPECIES_SUNKERN
.byte 0x00 @ SPECIES_SUNFLORA
.byte 0x2b @ SPECIES_YANMA
.byte 0x00 @ SPECIES_WOOPER
.byte 0x16 @ SPECIES_QUAGSIRE
.byte 0x09 @ SPECIES_ESPEON
.byte 0x10 @ SPECIES_UMBREON
.byte 0x00 @ SPECIES_MURKROW
.byte 0x13 @ SPECIES_SLOWKING
.byte 0x1c @ SPECIES_MISDREAVUS
.byte 0x0a @ SPECIES_UNOWN
.byte 0x30 @ SPECIES_WOBBUFFET
.byte 0x1e @ SPECIES_GIRAFARIG
.byte 0x0b @ SPECIES_PINECO
.byte 0x10 @ SPECIES_FORRETRESS
.byte 0x00 @ SPECIES_DUNSPARCE
.byte 0x13 @ SPECIES_GLIGAR
.byte 0x0f @ SPECIES_STEELIX
.byte 0x17 @ SPECIES_SNUBBULL
.byte 0x10 @ SPECIES_GRANBULL
.byte 0x3a @ SPECIES_QWILFISH
.byte 0x02 @ SPECIES_SCIZOR
.byte 0x0b @ SPECIES_SHUCKLE
.byte 0x41 @ SPECIES_HERACROSS
.byte 0x16 @ SPECIES_SNEASEL
.byte 0x17 @ SPECIES_TEDDIURSA
.byte 0x10 @ SPECIES_URSARING
.byte 0x17 @ SPECIES_SLUGMA
.byte 0x17 @ SPECIES_MAGCARGO
.byte 0x00 @ SPECIES_SWINUB
.byte 0x0f @ SPECIES_PILOSWINE
.byte 0x03 @ SPECIES_CORSOLA
.byte 0x52 @ SPECIES_REMORAID
.byte 0x17 @ SPECIES_OCTILLERY
.byte 0x52 @ SPECIES_DELIBIRD
.byte 0x0d @ SPECIES_MANTINE
.byte 0x17 @ SPECIES_SKARMORY
.byte 0x17 @ SPECIES_HOUNDOUR
.byte 0x10 @ SPECIES_HOUNDOOM
.byte 0x42 @ SPECIES_KINGDRA
.byte 0x32 @ SPECIES_PHANPY
.byte 0x19 @ SPECIES_DONPHAN
.byte 0x00 @ SPECIES_PORYGON2
.byte 0x00 @ SPECIES_STANTLER
.byte 0x31 @ SPECIES_SMEARGLE
.byte 0x16 @ SPECIES_TYROGUE
.byte 0x02 @ SPECIES_HITMONTOP
.byte 0x09 @ SPECIES_SMOOCHUM
.byte 0x2c @ SPECIES_ELEKID
.byte 0x00 @ SPECIES_MAGBY
.byte 0x45 @ SPECIES_MILTANK
.byte 0x00 @ SPECIES_BLISSEY
.byte 0x2c @ SPECIES_RAIKOU
.byte 0x09 @ SPECIES_ENTEI
.byte 0x10 @ SPECIES_SUICUNE
.byte 0x52 @ SPECIES_LARVITAR
.byte 0x10 @ SPECIES_PUPITAR
.byte 0x0f @ SPECIES_TYRANITAR
.byte 0x3a @ SPECIES_LUGIA
.byte 0x09 @ SPECIES_HO_OH
.byte 0x18 @ SPECIES_CELEBI
.byte 0x00 @ 252
.byte 0x00 @ 253
.byte 0x00 @ 254
.byte 0x00 @ 255
.byte 0x00 @ 256
.byte 0x00 @ 257
.byte 0x00 @ 258
.byte 0x00 @ 259
.byte 0x00 @ 260
.byte 0x00 @ 261
.byte 0x00 @ 262
.byte 0x00 @ 263
.byte 0x00 @ 264
.byte 0x00 @ 265
.byte 0x00 @ 266
.byte 0x00 @ 267
.byte 0x00 @ 268
.byte 0x00 @ 269
.byte 0x00 @ 270
.byte 0x00 @ 271
.byte 0x00 @ 272
.byte 0x00 @ 273
.byte 0x00 @ 274
.byte 0x00 @ 275
.byte 0x00 @ 276
.byte 0x00 @ SPECIES_TREECKO
.byte 0x17 @ SPECIES_GROVYLE
.byte 0x10 @ SPECIES_SCEPTILE
.byte 0x16 @ SPECIES_TORCHIC
.byte 0x06 @ SPECIES_COMBUSKEN
.byte 0x0f @ SPECIES_BLAZIKEN
.byte 0x01 @ SPECIES_MUDKIP
.byte 0x04 @ SPECIES_MARSHTOMP
.byte 0x1e @ SPECIES_SWAMPERT
.byte 0x10 @ SPECIES_POOCHYENA
.byte 0x10 @ SPECIES_MIGHTYENA
.byte 0x03 @ SPECIES_ZIGZAGOON
.byte 0x09 @ SPECIES_LINOONE
.byte 0x00 @ SPECIES_WURMPLE
.byte 0x00 @ SPECIES_SILCOON
.byte 0x04 @ SPECIES_BEAUTIFLY
.byte 0x04 @ SPECIES_CASCOON
.byte 0x06 @ SPECIES_DUSTOX
.byte 0x00 @ SPECIES_LOTAD
.byte 0x00 @ SPECIES_LOMBRE
.byte 0x49 @ SPECIES_LUDICOLO
.byte 0x05 @ SPECIES_SEEDOT
.byte 0x00 @ SPECIES_NUZLEAF
.byte 0x02 @ SPECIES_SHIFTRY
.byte 0x00 @ SPECIES_NINCADA
.byte 0x46 @ SPECIES_NINJASK
.byte 0x1c @ SPECIES_SHEDINJA
.byte 0x1e @ SPECIES_TAILLOW
.byte 0x01 @ SPECIES_SWELLOW
.byte 0x00 @ SPECIES_SHROOMISH
.byte 0x00 @ SPECIES_BRELOOM
.byte 0x31 @ SPECIES_SPINDA
.byte 0x1b @ SPECIES_WINGULL
.byte 0x1c @ SPECIES_PELIPPER
.byte 0x00 @ SPECIES_SURSKIT
.byte 0x00 @ SPECIES_MASQUERAIN
.byte 0x01 @ SPECIES_WAILMER
.byte 0x1c @ SPECIES_WAILORD
.byte 0x00 @ SPECIES_SKITTY
.byte 0x17 @ SPECIES_DELCATTY
.byte 0x35 @ SPECIES_KECLEON
.byte 0x1d @ SPECIES_BALTOY
.byte 0x51 @ SPECIES_CLAYDOL
.byte 0x49 @ SPECIES_NOSEPASS
.byte 0x17 @ SPECIES_TORKOAL
.byte 0x15 @ SPECIES_SABLEYE
.byte 0x49 @ SPECIES_BARBOACH
.byte 0x49 @ SPECIES_WHISCASH
.byte 0x1d @ SPECIES_LUVDISC
.byte 0x10 @ SPECIES_CORPHISH
.byte 0x09 @ SPECIES_CRAWDAUNT
.byte 0x49 @ SPECIES_FEEBAS
.byte 0x22 @ SPECIES_MILOTIC
.byte 0x49 @ SPECIES_CARVANHA
.byte 0x56 @ SPECIES_SHARPEDO
.byte 0x10 @ SPECIES_TRAPINCH
.byte 0x0f @ SPECIES_VIBRAVA
.byte 0x4b @ SPECIES_FLYGON
.byte 0x0b @ SPECIES_MAKUHITA
.byte 0x34 @ SPECIES_HARIYAMA
.byte 0x00 @ SPECIES_ELECTRIKE
.byte 0x00 @ SPECIES_MANECTRIC
.byte 0x04 @ SPECIES_NUMEL
.byte 0x10 @ SPECIES_CAMERUPT
.byte 0x53 @ SPECIES_SPHEAL
.byte 0x17 @ SPECIES_SEALEO
.byte 0x0f @ SPECIES_WALREIN
.byte 0x49 @ SPECIES_CACNEA
.byte 0x04 @ SPECIES_CACTURNE
.byte 0x45 @ SPECIES_SNORUNT
.byte 0x0a @ SPECIES_GLALIE
.byte 0x0e @ SPECIES_LUNATONE
.byte 0x08 @ SPECIES_SOLROCK
.byte 0x00 @ SPECIES_AZURILL
.byte 0x56 @ SPECIES_SPOINK
.byte 0x32 @ SPECIES_GRUMPIG
.byte 0x00 @ SPECIES_PLUSLE
.byte 0x01 @ SPECIES_MINUN
.byte 0x00 @ SPECIES_MAWILE
.byte 0x05 @ SPECIES_MEDITITE
.byte 0x45 @ SPECIES_MEDICHAM
.byte 0x04 @ SPECIES_SWABLU
.byte 0x16 @ SPECIES_ALTARIA
.byte 0x32 @ SPECIES_WYNAUT
.byte 0x0a @ SPECIES_DUSKULL
.byte 0x02 @ SPECIES_DUSCLOPS
.byte 0x45 @ SPECIES_ROSELIA
.byte 0x45 @ SPECIES_SLAKOTH
.byte 0x31 @ SPECIES_VIGOROTH
.byte 0x45 @ SPECIES_SLAKING
.byte 0x00 @ SPECIES_GULPIN
.byte 0x45 @ SPECIES_SWALOT
.byte 0x10 @ SPECIES_TROPIUS
.byte 0x03 @ SPECIES_WHISMUR
.byte 0x49 @ SPECIES_LOUDRED
.byte 0x19 @ SPECIES_EXPLOUD
.byte 0x12 @ SPECIES_CLAMPERL
.byte 0x09 @ SPECIES_HUNTAIL
.byte 0x1c @ SPECIES_GOREBYSS
.byte 0x11 @ SPECIES_ABSOL
.byte 0x1c @ SPECIES_SHUPPET
.byte 0x0d @ SPECIES_BANETTE
.byte 0x17 @ SPECIES_SEVIPER
.byte 0x09 @ SPECIES_ZANGOOSE
.byte 0x1a @ SPECIES_RELICANTH
.byte 0x45 @ SPECIES_ARON
.byte 0x00 @ SPECIES_LAIRON
.byte 0x19 @ SPECIES_AGGRON
.byte 0x1d @ SPECIES_CASTFORM
.byte 0x00 @ SPECIES_VOLBEAT
.byte 0x05 @ SPECIES_ILLUMISE
.byte 0x17 @ SPECIES_LILEEP
.byte 0x19 @ SPECIES_CRADILY
.byte 0x12 @ SPECIES_ANORITH
.byte 0x10 @ SPECIES_ARMALDO
.byte 0x45 @ SPECIES_RALTS
.byte 0x00 @ SPECIES_KIRLIA
.byte 0x00 @ SPECIES_GARDEVOIR
.byte 0x19 @ SPECIES_BAGON
.byte 0x04 @ SPECIES_SHELGON
.byte 0x0f @ SPECIES_SALAMENCE
.byte 0x0f @ SPECIES_BELDUM
.byte 0x04 @ SPECIES_METANG
.byte 0x10 @ SPECIES_METAGROSS
.byte 0x01 @ SPECIES_REGIROCK
.byte 0x44 @ SPECIES_REGICE
.byte 0x09 @ SPECIES_REGISTEEL
.byte 0x2d @ SPECIES_KYOGRE
.byte 0x10 @ SPECIES_GROUDON
.byte 0x0f @ SPECIES_RAYQUAZA
.byte 0x2d @ SPECIES_LATIAS
.byte 0x10 @ SPECIES_LATIOS
.byte 0x0d @ SPECIES_JIRACHI
.byte 0x1b @ SPECIES_DEOXYS
.byte 0x1d @ SPECIES_CHIMECHO

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,10 @@
.align 2
gTrainerBackPicCoords:: @ 8305D2C
.byte 0x08, 0x04, 0x00, 0x00
.byte 0x08, 0x04, 0x00, 0x00
.byte 0x08, 0x05, 0x00, 0x00
.byte 0x08, 0x05, 0x00, 0x00
.byte 0x08, 0x04, 0x00, 0x00
.byte 0x08, 0x04, 0x00, 0x00
.byte 0x08, 0x04, 0x00, 0x00
.byte 0x08, 0x04, 0x00, 0x00

View File

@ -0,0 +1,95 @@
.align 2
gTrainerFrontPicCoords:: @ 83054E0
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x02, 0x00, 0x00
.byte 0x08, 0x02, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x02, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x02, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x02, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x02, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00
.byte 0x08, 0x01, 0x00, 0x00

141
data/main_menu.s Normal file
View File

@ -0,0 +1,141 @@
@ the second big chunk of data
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_082FECFC:: @ 82FECFC
.incbin "graphics/birch_speech/bg0.gbapal"
.incbin "graphics/birch_speech/bg1.gbapal"
.align 2
gBirchIntroShadowGfx:: @ 82FED3C
.incbin "graphics/birch_speech/shadow.4bpp.lz"
.align 2
gUnknown_082FEEF0:: @ 82FEEF0
.incbin "graphics/birch_speech/map.bin.lz"
.align 2
gUnknown_082FF018:: @ 82FF018
.incbin "graphics/birch_speech/bg2.gbapal"
.align 2
gUnknown_082FF028:: @ 82FF028
.space 16
.align 2
gUnknown_082FF038:: @ 82FF038
window_template 0x00, 0x02, 0x01, 0x1a, 0x02, 0x0f, 0x0001
window_template 0x00, 0x02, 0x05, 0x1a, 0x02, 0x0f, 0x0035
.align 2
gUnknown_082FF048:: @ 82FF048
window_template 0x00, 0x02, 0x01, 0x1a, 0x06, 0x0f, 0x0001
window_template 0x00, 0x02, 0x09, 0x1a, 0x02, 0x0f, 0x009d
window_template 0x00, 0x02, 0x0d, 0x1a, 0x02, 0x0f, 0x00d1
window_template 0x00, 0x02, 0x11, 0x1a, 0x02, 0x0f, 0x0105
window_template 0x00, 0x02, 0x15, 0x1a, 0x02, 0x0f, 0x0139
.align 2
gUnknown_082FF070:: @ 82FF070
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x0f, 0x016d
window_template_terminator
.align 2
gUnknown_082FF080:: @ 82FF080
window_template 0x00, 0x02, 0x0f, 0x1b, 0x04, 0x0f, 0x0001
.align 2
gUnknown_082FF088:: @ 82FF088
window_template 0x00, 0x03, 0x05, 0x06, 0x04, 0x0f, 0x006d
window_template 0x00, 0x03, 0x02, 0x09, 0x0a, 0x0f, 0x0085
window_template_terminator
.align 2
gMainMenuBgPal:: @ 82FF0A0
.incbin "graphics/misc/main_menu_bg.gbapal"
.align 2
gMainMenuTextPal:: @ 82FF0C0
.incbin "graphics/misc/main_menu_text.gbapal"
.align 2
gUnknown_082FF0E0:: @ 82FF0E0
.byte 0x0a, 0x0b, 0x0c
gUnknown_082FF0E3:: @ 82FF0E3
.byte 0x0a, 0x01, 0x0c
.align 2
gUnknown_082FF0E8:: @ 82FF0E8
.4byte 0x000001e8, 0x00003071
.align 2
gUnknown_082FF0F0:: @ 82FF0F0
.4byte 0x000001ec
.align 2
gUnknown_082FF0F4:: @ 82FF0F4
.byte 0x02, 0x78, 0x08, 0x03, 0x78, 0x98, 0x03, 0x00, 0x04, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00
.align 2
gUnknown_082FF104:: @ 82FF104
.2byte 0xfffe, 0xfffe, 0x3000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF114:: @ 82FF114
.4byte gUnknown_082FF104
.align 2
gUnknown_082FF118:: @ 82FF118
.4byte gText_BirchBoy, 0x00000000
.4byte gText_BirchGirl, 0x00000000
.align 2
gMalePresetNames:: @ 82FF128
.4byte gText_DefaultNameStu
.4byte gText_DefaultNameMilton
.4byte gText_DefaultNameTom
.4byte gText_DefaultNameKenny
.4byte gText_DefaultNameReid
.4byte gText_DefaultNameJude
.4byte gText_DefaultNameJaxson
.4byte gText_DefaultNameEaston
.4byte gText_DefaultNameWalker
.4byte gText_DefaultNameTeru
.4byte gText_DefaultNameJohnny
.4byte gText_DefaultNameBrett
.4byte gText_DefaultNameSeth
.4byte gText_DefaultNameTerry
.4byte gText_DefaultNameCasey
.4byte gText_DefaultNameDarren
.4byte gText_DefaultNameLandon
.4byte gText_DefaultNameCollin
.4byte gText_DefaultNameStanley
.4byte gText_DefaultNameQuincy
.align 2
gFemalePresetNames:: @ 82FF178
.4byte gText_DefaultNameKimmy
.4byte gText_DefaultNameTiara
.4byte gText_DefaultNameBella
.4byte gText_DefaultNameJayla
.4byte gText_DefaultNameAllie
.4byte gText_DefaultNameLianna
.4byte gText_DefaultNameSara
.4byte gText_DefaultNameMonica
.4byte gText_DefaultNameCamila
.4byte gText_DefaultNameAubree
.4byte gText_DefaultNameRuthie
.4byte gText_DefaultNameHazel
.4byte gText_DefaultNameNadine
.4byte gText_DefaultNameTanja
.4byte gText_DefaultNameYasmin
.4byte gText_DefaultNameNicola
.4byte gText_DefaultNameLillie
.4byte gText_DefaultNameTerra
.4byte gText_DefaultNameLucy
.4byte gText_DefaultNameHalie

View File

@ -95,7 +95,7 @@ gUnknown_0856E688:: @ 856E688
.incbin "baserom.gba", 0x56e688, 0xc
@ 856E694
.include "data/graphics/pokemon/mon_footprint_table.inc"
.include "data/graphics/pokemon/footprint_table.inc"
gUnknown_0856ED08:: @ 856ED08
.incbin "baserom.gba", 0x56ed08, 0x28

View File

@ -5,19 +5,20 @@
.align 2, 0
@ 857BCA8
.include "data/graphics/pokemon/mon_icon_table.inc"
.include "data/graphics/pokemon/icon_table.inc"
@ 857C388
.include "data/graphics/pokemon/mon_icon_palette_indices.inc"
.include "data/graphics/pokemon/icon_palette_indices.inc"
@ 857C540
.include "data/graphics/pokemon/mon_icon_palette_table.inc"
.include "data/graphics/pokemon/icon_palette_table.inc"
gUnknown_0857C570:: @ 857C570
.incbin "baserom.gba", 0x57c570, 0x44
gUnknown_0857C5B4:: @ 857C5B4
.incbin "baserom.gba", 0x57c5b4, 0x34
.incbin "baserom.gba", 0x57c5b4, 0x14
.incbin "baserom.gba", 0x57c5c8, 0x20
gUnknown_0857C5E8:: @ 857C5E8
.incbin "baserom.gba", 0x57c5e8, 0x8

View File

@ -4,20 +4,75 @@
.section .rodata
.align 2, 0
gUnknown_08510404:: @ 8510404
.incbin "baserom.gba", 0x510404, 0x4
gUnknown_08510404:: @ 8510404 struct BgTemplate
.4byte 0x000001f0
.align 2
gUnknown_08510408:: @ 8510408
.incbin "baserom.gba", 0x510408, 0x14
gUnknown_0851041C:: @ 851041C
.incbin "baserom.gba", 0x51041c, 0x4
window_template 0x00, 0x01, 0x01, 0x13, 0x09, 0x0f, 0x0155
window_template 0x00, 0x02, 0x0f, 0x1b, 0x04, 0x0f, 0x00e9
window_template_terminator
.align 2
gUnknown_08510420:: @ 8510420
.incbin "baserom.gba", 0x510420, 0xa4
window_template 0x00, 0x04, 0x09, 0x15, 0x02, 0x0f, 0x00bf
.align 2
gUnknown_08510428:: @ 8510428
.byte 3, 0, 1, 0, 15, 39, 0, 2, 0, 0, 0, 0
.byte 4, 0, 0, 0, 23, 0, 1, 3, 0, 0, 0, 0
.byte 5, 0, 0, 0, 59, 0, 2, 4, 0, 0, 0, 0
.byte 6, 0, 0, 0, 59, 0, 3, 5, 0, 0, 0, 0
.byte 7, 0, 0, 0, 0, 0, 4, 0, 6, 0, 0, 0
.align 2
gOamData_08510464:: @ 8510464
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.align 2
gResetRtcScreen_DownArrowGfx:: @ 851046C
.incbin "graphics/misc/reset_rtc_screen_downarrow.4bpp"
.align 2
gResetRtcScreen_RightArrowGfx:: @ 851048C
.incbin "graphics/misc/reset_rtc_screen_rightarrow.4bpp"
.align 2
gResetRtcScreen_ArrowPal: @ 85104AC
.incbin "graphics/misc/reset_rtc_screen_arrow.gbapal"
.align 2
gSpriteImageTable_85104B4:: @ 85104B4
obj_frame_tiles gResetRtcScreen_DownArrowGfx, 0x20
obj_frame_tiles gResetRtcScreen_RightArrowGfx, 0x20
.align 2
gUnknown_085104C4:: @ 85104C4
.incbin "baserom.gba", 0x5104c4, 0x2c
obj_pal gResetRtcScreen_ArrowPal, 0x1000
gUnknown_085104F0:: @ 85104F0
.incbin "baserom.gba", 0x5104f0, 0x18
.align 2
gSpriteAnim_85104CC:: @ 85104CC
obj_image_anim_frame 0, 30
obj_image_anim_jump 0
.align 2
gSpriteAnim_85104D4: @ 85104D4
obj_image_anim_frame 0, 30, OBJ_IMAGE_ANIM_V_FLIP
obj_image_anim_jump 0
.align 2
gSpriteAnim_85104DC:: @ 85104DC
obj_image_anim_frame 1, 30
obj_image_anim_jump 0
.align 2
gSpriteAnimTable_85104E4:: @ 85104E4
.4byte gSpriteAnim_85104CC
.4byte gSpriteAnim_85104D4
.4byte gSpriteAnim_85104DC
.align 2
gSpriteTemplate_85104F0:: @ 85104F0
spr_template 0xFFFF, 0x1000, gOamData_08510464, gSpriteAnimTable_85104E4, gSpriteImageTable_85104B4, gDummySpriteAffineAnimTable, SpriteCallbackDummy

View File

@ -165,130 +165,130 @@ gText_PickCancel:: @ 85E8574
gText_UnkCtrlF800Exit:: @ 85E8588
.string "{UNK_CTRL_F800}EXIT$"
gUnknown_085E858F:: @ 85E858F
gText_BirchBoy:: @ 85E858F
.string "BOY$"
gUnknown_085E8593:: @ 85E8593
gText_BirchGirl:: @ 85E8593
.string "GIRL$"
gUnknown_085E8598:: @ 85E8598
gText_DefaultNameStu:: @ 85E8598
.string "STU$"
gUnknown_085E859C:: @ 85E859C
gText_DefaultNameMilton:: @ 85E859C
.string "MILTON$"
gUnknown_085E85A3:: @ 85E85A3
gText_DefaultNameTom:: @ 85E85A3
.string "TOM$"
gUnknown_085E85A7:: @ 85E85A7
gText_DefaultNameKenny:: @ 85E85A7
.string "KENNY$"
gUnknown_085E85AD:: @ 85E85AD
gText_DefaultNameReid:: @ 85E85AD
.string "REID$"
gUnknown_085E85B2:: @ 85E85B2
gText_DefaultNameJude:: @ 85E85B2
.string "JUDE$"
gUnknown_085E85B7:: @ 85E85B7
gText_DefaultNameJaxson:: @ 85E85B7
.string "JAXSON$"
gUnknown_085E85BE:: @ 85E85BE
gText_DefaultNameEaston:: @ 85E85BE
.string "EASTON$"
gUnknown_085E85C5:: @ 85E85C5
gText_DefaultNameWalker:: @ 85E85C5
.string "WALKER$"
gUnknown_085E85CC:: @ 85E85CC
gText_DefaultNameTeru:: @ 85E85CC
.string "TERU$"
gUnknown_085E85D1:: @ 85E85D1
gText_DefaultNameJohnny:: @ 85E85D1
.string "JOHNNY$"
gUnknown_085E85D8:: @ 85E85D8
gText_DefaultNameBrett:: @ 85E85D8
.string "BRETT$"
gUnknown_085E85DE:: @ 85E85DE
gText_DefaultNameSeth:: @ 85E85DE
.string "SETH$"
gUnknown_085E85E3:: @ 85E85E3
gText_DefaultNameTerry:: @ 85E85E3
.string "TERRY$"
gUnknown_085E85E9:: @ 85E85E9
gText_DefaultNameCasey:: @ 85E85E9
.string "CASEY$"
gUnknown_085E85EF:: @ 85E85EF
gText_DefaultNameDarren:: @ 85E85EF
.string "DARREN$"
gUnknown_085E85F6:: @ 85E85F6
gText_DefaultNameLandon:: @ 85E85F6
.string "LANDON$"
gUnknown_085E85FD:: @ 85E85FD
gText_DefaultNameCollin:: @ 85E85FD
.string "COLLIN$"
gUnknown_085E8604:: @ 85E8604
gText_DefaultNameStanley:: @ 85E8604
.string "STANLEY$"
gUnknown_085E860C:: @ 85E860C
gText_DefaultNameQuincy:: @ 85E860C
.string "QUINCY$"
gUnknown_085E8613:: @ 85E8613
gText_DefaultNameKimmy:: @ 85E8613
.string "KIMMY$"
gUnknown_085E8619:: @ 85E8619
gText_DefaultNameTiara:: @ 85E8619
.string "TIARA$"
gUnknown_085E861F:: @ 85E861F
gText_DefaultNameBella:: @ 85E861F
.string "BELLA$"
gUnknown_085E8625:: @ 85E8625
gText_DefaultNameJayla:: @ 85E8625
.string "JAYLA$"
gUnknown_085E862B:: @ 85E862B
gText_DefaultNameAllie:: @ 85E862B
.string "ALLIE$"
gUnknown_085E8631:: @ 85E8631
gText_DefaultNameLianna:: @ 85E8631
.string "LIANNA$"
gUnknown_085E8638:: @ 85E8638
gText_DefaultNameSara:: @ 85E8638
.string "SARA$"
gUnknown_085E863D:: @ 85E863D
gText_DefaultNameMonica:: @ 85E863D
.string "MONICA$"
gUnknown_085E8644:: @ 85E8644
gText_DefaultNameCamila:: @ 85E8644
.string "CAMILA$"
gUnknown_085E864B:: @ 85E864B
gText_DefaultNameAubree:: @ 85E864B
.string "AUBREE$"
gUnknown_085E8652:: @ 85E8652
gText_DefaultNameRuthie:: @ 85E8652
.string "RUTHIE$"
gUnknown_085E8659:: @ 85E8659
gText_DefaultNameHazel:: @ 85E8659
.string "HAZEL$"
gUnknown_085E865F:: @ 85E865F
gText_DefaultNameNadine:: @ 85E865F
.string "NADINE$"
gUnknown_085E8666:: @ 85E8666
gText_DefaultNameTanja:: @ 85E8666
.string "TANJA$"
gUnknown_085E866C:: @ 85E866C
gText_DefaultNameYasmin:: @ 85E866C
.string "YASMIN$"
gUnknown_085E8673:: @ 85E8673
gText_DefaultNameNicola:: @ 85E8673
.string "NICOLA$"
gUnknown_085E867A:: @ 85E867A
gText_DefaultNameLillie:: @ 85E867A
.string "LILLIE$"
gUnknown_085E8681:: @ 85E8681
gText_DefaultNameTerra:: @ 85E8681
.string "TERRA$"
gUnknown_085E8687:: @ 85E8687
gText_DefaultNameLucy:: @ 85E8687
.string "LUCY$"
gUnknown_085E868C:: @ 85E868C
gText_DefaultNameHalie:: @ 85E868C
.string "HALIE$"
gText_ThisIsAPokemon:: @ 85E8692
@ -4452,16 +4452,16 @@ gText_ButtonTypeLEqualsA:: @ 85EE65D
gText_XPLink:: @ 85EE667
.string "{STR_VAR_1}P LINK$"
gUnknown_085EE670:: @ 85EE670
gText_BronzeCard:: @ 85EE670
.string "BRONZE$"
gUnknown_085EE677:: @ 85EE677
gText_CopperCard:: @ 85EE677
.string "COPPER$"
gUnknown_085EE67E:: @ 85EE67E
gText_SilverCard:: @ 85EE67E
.string "SILVER$"
gUnknown_085EE685:: @ 85EE685
gText_GoldCard:: @ 85EE685
.string "GOLD$"
gText_Day:: @ 85EE68A

View File

@ -1,9 +1,12 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.section .rodata
.align 2, 0
.incbin "graphics/title_screen/unk_853EF78.gbapal"
.align 2
gTitleScreenRayquazaGfx:: @ 853F058
.incbin "graphics/title_screen/rayquaza.4bpp.lz"

59
data/trainer_money.inc Normal file
View File

@ -0,0 +1,59 @@
@ This is a factor in how much money you get for beating a trainer.
.align 2
gTrainerMoneyTable:: @ 831AEB8
.byte TRAINER_CLASS_NAME_TEAM_AQUA, 5, 0, 0
.byte TRAINER_CLASS_NAME_AQUA_ADMIN, 10, 0, 0
.byte TRAINER_CLASS_NAME_AQUA_LEADER, 20, 0, 0
.byte TRAINER_CLASS_NAME_AROMA_LADY, 10, 0, 0
.byte TRAINER_CLASS_NAME_RUIN_MANIAC, 15, 0, 0
.byte TRAINER_CLASS_NAME_INTERVIEWER, 12, 0, 0
.byte TRAINER_CLASS_NAME_TUBER_1, 1, 0, 0
.byte TRAINER_CLASS_NAME_TUBER_2, 1, 0, 0
.byte TRAINER_CLASS_NAME_SIS_AND_BRO, 3, 0, 0
.byte TRAINER_CLASS_NAME_COOLTRAINER_1, 12, 0, 0
.byte TRAINER_CLASS_NAME_HEX_MANIAC, 6, 0, 0
.byte TRAINER_CLASS_NAME_LADY, 50, 0, 0
.byte TRAINER_CLASS_NAME_BEAUTY, 20, 0, 0
.byte TRAINER_CLASS_NAME_RICH_BOY, 50, 0, 0
.byte TRAINER_CLASS_NAME_POKEMANIAC, 15, 0, 0
.byte TRAINER_CLASS_NAME_SWIMMER_M, 2, 0, 0
.byte TRAINER_CLASS_NAME_BLACK_BELT, 8, 0, 0
.byte TRAINER_CLASS_NAME_GUITARIST, 8, 0, 0
.byte TRAINER_CLASS_NAME_KINDLER, 8, 0, 0
.byte TRAINER_CLASS_NAME_CAMPER, 4, 0, 0
.byte TRAINER_CLASS_NAME_OLD_COUPLE, 10, 0, 0
.byte TRAINER_CLASS_NAME_BUG_MANIAC, 15, 0, 0
.byte TRAINER_CLASS_NAME_PSYCHIC, 6, 0, 0
.byte TRAINER_CLASS_NAME_GENTLEMAN, 20, 0, 0
.byte TRAINER_CLASS_NAME_ELITE_FOUR, 25, 0, 0
.byte TRAINER_CLASS_NAME_LEADER, 25, 0, 0
.byte TRAINER_CLASS_NAME_SCHOOL_KID, 5, 0, 0
.byte TRAINER_CLASS_NAME_SR_AND_JR, 4, 0, 0
.byte TRAINER_CLASS_NAME_POKEFAN, 20, 0, 0
.byte TRAINER_CLASS_NAME_EXPERT, 10, 0, 0
.byte TRAINER_CLASS_NAME_YOUNGSTER, 4, 0, 0
.byte TRAINER_CLASS_NAME_CHAMPION, 50, 0, 0
.byte TRAINER_CLASS_NAME_FISHERMAN, 10, 0, 0
.byte TRAINER_CLASS_NAME_TRIATHLETE, 10, 0, 0
.byte TRAINER_CLASS_NAME_DRAGON_TAMER, 12, 0, 0
.byte TRAINER_CLASS_NAME_BIRD_KEEPER, 8, 0, 0
.byte TRAINER_CLASS_NAME_NINJA_BOY, 3, 0, 0
.byte TRAINER_CLASS_NAME_BATTLE_GIRL, 6, 0, 0
.byte TRAINER_CLASS_NAME_PARASOL_LADY, 10, 0, 0
.byte TRAINER_CLASS_NAME_SWIMMER_F, 2, 0, 0
.byte TRAINER_CLASS_NAME_PICNICKER, 4, 0, 0
.byte TRAINER_CLASS_NAME_TWINS, 3, 0, 0
.byte TRAINER_CLASS_NAME_SAILOR, 8, 0, 0
.byte TRAINER_CLASS_NAME_COLLECTOR, 15, 0, 0
.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3, 15, 0, 0
.byte TRAINER_CLASS_NAME_PKMN_BREEDER, 10, 0, 0
.byte TRAINER_CLASS_NAME_PKMN_RANGER, 12, 0, 0
.byte TRAINER_CLASS_NAME_TEAM_MAGMA, 5, 0, 0
.byte TRAINER_CLASS_NAME_MAGMA_ADMIN, 10, 0, 0
.byte TRAINER_CLASS_NAME_MAGMA_LEADER, 20, 0, 0
.byte TRAINER_CLASS_NAME_LASS, 4, 0, 0
.byte TRAINER_CLASS_NAME_BUG_CATCHER, 4, 0, 0
.byte TRAINER_CLASS_NAME_HIKER, 10, 0, 0
.byte TRAINER_CLASS_NAME_YOUNG_COUPLE, 8, 0, 0
.byte TRAINER_CLASS_LEADER_1, 10, 0, 0
.byte -1, 5, 0, 0

View File

@ -2,13 +2,82 @@
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_0855072C:: @ 855072C
.incbin "baserom.gba", 0x55072c, 0x10
.align 2
gEmotion_ExclamationMarkGfx:: @ 85505AC
.incbin "graphics/misc/emotion_exclamation.4bpp"
gUnknown_0855073C:: @ 855073C
.incbin "baserom.gba", 0x55073c, 0x30
.align 2
gEmotion_QuestionMarkGfx:: @ 855062C
.incbin "graphics/misc/emotion_question.4bpp"
gUnknown_0855076C:: @ 855076C
.incbin "baserom.gba", 0x55076c, 0x48
.align 2
gEmotion_HeartGfx:: @ 85506AC
.incbin "graphics/misc/emotion_heart.4bpp"
.align 2
gIsTrainerInRange:: @ 855072C
.4byte IsTrainerInRangeSouth
.4byte IsTrainerInRangeNorth
.4byte IsTrainerInRangeWest
.4byte IsTrainerInRangeEast
.align 2
gTrainerSeeFuncList:: @ 855073C
.4byte sub_80B4178
.4byte sub_80B417C
.4byte sub_80B41C0
.4byte sub_80B4200
.4byte sub_80B425C
.4byte sub_80B4318
.4byte sub_80B435C
.4byte sub_80B4390
.4byte sub_80B43AC
.4byte sub_80B43E0
.4byte sub_80B4438
.4byte sub_80B44AC
.align 2
gTrainerSeeFuncList2:: @ 855076C
.4byte sub_80B43AC
.4byte sub_80B43E0
.4byte sub_80B4438
.4byte sub_80B44AC
.align 2
gOamData_855077C:: @ 855077C
.2byte 0x0000
.2byte 0x4000
.2byte 0x0400
.align 2
gSpriteImageTable_8550784:: @ 8550784
obj_frame_tiles gEmotion_ExclamationMarkGfx, 0x0080
obj_frame_tiles gEmotion_QuestionMarkGfx, 0x0080
.align 2
gSpriteImageTable_8550794:: @ 8550794
obj_frame_tiles gEmotion_HeartGfx, 0x0080
.align 2
gSpriteAnim_855079C:: @ 855079C
obj_image_anim_frame 0, 60
obj_image_anim_end
.align 2
gSpriteAnim_85507A4:: @ 85507A4
obj_image_anim_frame 1, 60
obj_image_anim_end
.align 2
gSpriteAnimTable_85507AC:: @ 85507AC
.4byte gSpriteAnim_855079C
.4byte gSpriteAnim_85507A4
.align 2
gSpriteTemplate_85507B4:: @ 85507B4
spr_template 0xffff, 0xffff, gOamData_855077C, gSpriteAnimTable_85507AC, gSpriteImageTable_8550784, gDummySpriteAffineAnimTable, objc_exclamation_mark_probably
.align 2
gSpriteTemplate_85507CC:: @ 85507CC
spr_template 0xffff, 0x1004, gOamData_855077C, gSpriteAnimTable_85507AC, gSpriteImageTable_8550794, gDummySpriteAffineAnimTable, objc_exclamation_mark_probably

119
data/type_effectiveness.inc Normal file
View File

@ -0,0 +1,119 @@
@ format: attacking type, defending type, damage multiplier
@ the multiplier is a (decimal) fixed-point number:
@ 20 is ×2.0
@ 05 is ×0.5
@ 00 is ×0
gTypeEffectiveness:: @ 831ACE8
.byte TYPE_NORMAL, TYPE_ROCK, 5
.byte TYPE_NORMAL, TYPE_STEEL, 5
.byte TYPE_FIRE, TYPE_FIRE, 5
.byte TYPE_FIRE, TYPE_WATER, 5
.byte TYPE_FIRE, TYPE_GRASS, 20
.byte TYPE_FIRE, TYPE_ICE, 20
.byte TYPE_FIRE, TYPE_BUG, 20
.byte TYPE_FIRE, TYPE_ROCK, 5
.byte TYPE_FIRE, TYPE_DRAGON, 5
.byte TYPE_FIRE, TYPE_STEEL, 20
.byte TYPE_WATER, TYPE_FIRE, 20
.byte TYPE_WATER, TYPE_WATER, 5
.byte TYPE_WATER, TYPE_GRASS, 5
.byte TYPE_WATER, TYPE_GROUND, 20
.byte TYPE_WATER, TYPE_ROCK, 20
.byte TYPE_WATER, TYPE_DRAGON, 5
.byte TYPE_ELECTRIC, TYPE_WATER, 20
.byte TYPE_ELECTRIC, TYPE_ELECTRIC, 5
.byte TYPE_ELECTRIC, TYPE_GRASS, 5
.byte TYPE_ELECTRIC, TYPE_GROUND, 0
.byte TYPE_ELECTRIC, TYPE_FLYING, 20
.byte TYPE_ELECTRIC, TYPE_DRAGON, 5
.byte TYPE_GRASS, TYPE_FIRE, 5
.byte TYPE_GRASS, TYPE_WATER, 20
.byte TYPE_GRASS, TYPE_GRASS, 5
.byte TYPE_GRASS, TYPE_POISON, 5
.byte TYPE_GRASS, TYPE_GROUND, 20
.byte TYPE_GRASS, TYPE_FLYING, 5
.byte TYPE_GRASS, TYPE_BUG, 5
.byte TYPE_GRASS, TYPE_ROCK, 20
.byte TYPE_GRASS, TYPE_DRAGON, 5
.byte TYPE_GRASS, TYPE_STEEL, 5
.byte TYPE_ICE, TYPE_WATER, 5
.byte TYPE_ICE, TYPE_GRASS, 20
.byte TYPE_ICE, TYPE_ICE, 5
.byte TYPE_ICE, TYPE_GROUND, 20
.byte TYPE_ICE, TYPE_FLYING, 20
.byte TYPE_ICE, TYPE_DRAGON, 20
.byte TYPE_ICE, TYPE_STEEL, 5
.byte TYPE_ICE, TYPE_FIRE, 5
.byte TYPE_FIGHTING, TYPE_NORMAL, 20
.byte TYPE_FIGHTING, TYPE_ICE, 20
.byte TYPE_FIGHTING, TYPE_POISON, 5
.byte TYPE_FIGHTING, TYPE_FLYING, 5
.byte TYPE_FIGHTING, TYPE_PSYCHIC, 5
.byte TYPE_FIGHTING, TYPE_BUG, 5
.byte TYPE_FIGHTING, TYPE_ROCK, 20
.byte TYPE_FIGHTING, TYPE_DARK, 20
.byte TYPE_FIGHTING, TYPE_STEEL, 20
.byte TYPE_POISON, TYPE_GRASS, 20
.byte TYPE_POISON, TYPE_POISON, 5
.byte TYPE_POISON, TYPE_GROUND, 5
.byte TYPE_POISON, TYPE_ROCK, 5
.byte TYPE_POISON, TYPE_GHOST, 5
.byte TYPE_POISON, TYPE_STEEL, 0
.byte TYPE_GROUND, TYPE_FIRE, 20
.byte TYPE_GROUND, TYPE_ELECTRIC, 20
.byte TYPE_GROUND, TYPE_GRASS, 5
.byte TYPE_GROUND, TYPE_POISON, 20
.byte TYPE_GROUND, TYPE_FLYING, 0
.byte TYPE_GROUND, TYPE_BUG, 5
.byte TYPE_GROUND, TYPE_ROCK, 20
.byte TYPE_GROUND, TYPE_STEEL, 20
.byte TYPE_FLYING, TYPE_ELECTRIC, 5
.byte TYPE_FLYING, TYPE_GRASS, 20
.byte TYPE_FLYING, TYPE_FIGHTING, 20
.byte TYPE_FLYING, TYPE_BUG, 20
.byte TYPE_FLYING, TYPE_ROCK, 5
.byte TYPE_FLYING, TYPE_STEEL, 5
.byte TYPE_PSYCHIC, TYPE_FIGHTING, 20
.byte TYPE_PSYCHIC, TYPE_POISON, 20
.byte TYPE_PSYCHIC, TYPE_PSYCHIC, 5
.byte TYPE_PSYCHIC, TYPE_DARK, 0
.byte TYPE_PSYCHIC, TYPE_STEEL, 5
.byte TYPE_BUG, TYPE_FIRE, 5
.byte TYPE_BUG, TYPE_GRASS, 20
.byte TYPE_BUG, TYPE_FIGHTING, 5
.byte TYPE_BUG, TYPE_POISON, 5
.byte TYPE_BUG, TYPE_FLYING, 5
.byte TYPE_BUG, TYPE_PSYCHIC, 20
.byte TYPE_BUG, TYPE_GHOST, 5
.byte TYPE_BUG, TYPE_DARK, 20
.byte TYPE_BUG, TYPE_STEEL, 5
.byte TYPE_ROCK, TYPE_FIRE, 20
.byte TYPE_ROCK, TYPE_ICE, 20
.byte TYPE_ROCK, TYPE_FIGHTING, 5
.byte TYPE_ROCK, TYPE_GROUND, 5
.byte TYPE_ROCK, TYPE_FLYING, 20
.byte TYPE_ROCK, TYPE_BUG, 20
.byte TYPE_ROCK, TYPE_STEEL, 5
.byte TYPE_GHOST, TYPE_NORMAL, 0
.byte TYPE_GHOST, TYPE_PSYCHIC, 20
.byte TYPE_GHOST, TYPE_DARK, 5
.byte TYPE_GHOST, TYPE_STEEL, 5
.byte TYPE_GHOST, TYPE_GHOST, 20
.byte TYPE_DRAGON, TYPE_DRAGON, 20
.byte TYPE_DRAGON, TYPE_STEEL, 5
.byte TYPE_DARK, TYPE_FIGHTING, 5
.byte TYPE_DARK, TYPE_PSYCHIC, 20
.byte TYPE_DARK, TYPE_GHOST, 20
.byte TYPE_DARK, TYPE_DARK, 5
.byte TYPE_DARK, TYPE_STEEL, 5
.byte TYPE_STEEL, TYPE_FIRE, 5
.byte TYPE_STEEL, TYPE_WATER, 5
.byte TYPE_STEEL, TYPE_ELECTRIC, 5
.byte TYPE_STEEL, TYPE_ICE, 20
.byte TYPE_STEEL, TYPE_ROCK, 20
.byte TYPE_STEEL, TYPE_STEEL, 5
.byte 0xFE, 0xFE, 0
.byte TYPE_NORMAL, TYPE_GHOST, 0
.byte TYPE_FIGHTING, TYPE_GHOST, 0
.byte 0xFF, 0xFF, 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 255 164
255 255 106
222 222 90
189 189 74
156 156 57
123 123 49
90 90 32
57 57 16
197 255 205
123 255 131
115 222 106
106 189 90
98 156 65
90 123 49
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 255 164
255 255 106
222 222 90
189 189 74
156 156 57
123 123 49
90 90 32
57 57 16
197 255 205
123 255 131
115 222 106
106 189 90
98 156 65
90 123 49
0 0 0

View File

@ -0,0 +1,11 @@
JASC-PAL
0100
8
255 255 164
255 255 106
222 222 90
189 189 74
156 156 57
123 123 49
90 90 32
57 57 16

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 433 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
0 0 0
205 205 205
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
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 264 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 296 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 108 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 126 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 117 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
139 148 255
255 255 255
49 57 82
90 98 115
8 8 16
148 156 172
205 222 238
180 180 189
189 205 222
32 32 49
123 131 139
49 82 123
41 123 197
57 139 213
90 164 230
139 197 246

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 255 255
255 255 255
98 98 98
213 213 205
230 8 8
255 189 115
32 156 8
148 246 148
49 82 205
164 197 246
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,7 @@
JASC-PAL
0100
4
0 0 0
255 0 0
74 74 74
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 113 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 110 B

View File

@ -0,0 +1,115 @@
JASC-PAL
0100
112
0 0 0
0 0 0
16 16 16
32 32 32
49 49 49
65 65 65
90 90 90
106 106 106
123 123 123
139 139 139
156 156 156
180 180 180
197 197 197
213 213 213
255 255 255
255 0 0
0 0 0
98 148 16
98 156 16
106 164 24
115 172 32
123 180 41
131 197 49
139 205 57
148 213 65
156 222 74
180 106 172
0 0 0
0 0 0
148 115 115
123 131 65
197 197 197
123 131 65
255 255 255
255 255 255
255 255 255
0 32 0
8 41 8
24 57 16
41 74 32
49 90 41
65 106 49
82 123 65
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
189 106 8
0 139 74
255 255 255
8 106 49
8 115 57
16 123 65
16 131 74
24 148 82
24 156 90
32 164 98
41 180 115
8 65 57
205 255 197
255 255 255
255 0 0
0 0 0
123 131 65
255 255 255
255 255 255
255 255 255
0 0 0
8 8 8
24 24 24
41 41 41
49 49 49
65 65 65
82 82 82
0 123 230
255 255 255
255 255 255
255 0 0
255 189 0
255 255 255
255 255 255
255 255 255
255 255 255
0 0 0
41 74 32
65 106 49
90 139 74
115 180 98
139 213 123
172 255 148
0 123 230
255 255 255
255 255 255
255 0 0
255 189 0
189 106 8
0 139 74
255 255 255
8 106 49
8 115 57
16 123 65
16 131 74
24 148 82
24 156 90
32 164 98
41 180 115
8 65 57
180 230 172
255 255 255
255 0 0
255 189 0

View File

@ -604,7 +604,7 @@ struct BattleStruct
u8 field_8B;
u8 field_8C;
u8 field_8D;
u8 field_8E;
u8 stringMoveType;
u8 expGetterBank;
u8 field_90;
u8 field_91;

View File

@ -15,6 +15,7 @@ void SwapTurnOrder(u8 id1, u8 id2);
void BattleTurnPassed(void);
void RunBattleScriptCommands_PopCallbacksStack(void);
void RunBattleScriptCommands(void);
u32 sub_80397C4(u32 setId, u32 tableId);
void sub_8039E9C(struct Sprite *sprite);
extern const u8 gStatusConditionString_PoisonJpn[8];
@ -25,6 +26,6 @@ extern const u8 gStatusConditionString_IceJpn[8];
extern const u8 gStatusConditionString_ConfusionJpn[8];
extern const u8 gStatusConditionString_LoveJpn[8];
extern const u8 * const gStatusConditionStringsTable[][2];
extern const u8 * const gStatusConditionStringsTable[7][2];
#endif // GUARD_BATTLE_2_H

View File

@ -41,8 +41,8 @@ struct MovePpInfo
struct ChooseMoveStruct
{
u16 moves[4];
u8 ppNumbers[4];
u8 ppWithBonusNumbers[4];
u8 currentPp[4];
u8 maxPp[4];
u16 species;
u8 monType1;
u8 monType2;

View File

@ -3,59 +3,59 @@
// for 0xFD
#define B_TXT_BUFF1 00
#define B_TXT_BUFF2 01
#define B_TXT_COPY_VAR_1 02
#define B_TXT_COPY_VAR_2 03
#define B_TXT_COPY_VAR_3 04
#define B_TXT_PLAYER_MON1_NAME 05
#define B_TXT_OPPONENT_MON1_NAME 06
#define B_TXT_PLAYER_MON2_NAME 07
#define B_TXT_OPPONENT_MON2_NAME 08
#define B_TXT_LINK_PLAYER_MON1_NAME 09
#define B_TXT_LINK_OPPONENT_MON1_NAME 0A
#define B_TXT_LINK_PLAYER_MON2_NAME 0B
#define B_TXT_LINK_OPPONENT_MON2_NAME 0C
#define B_TXT_ATK_NAME_WITH_PREFIX_MON1 0D
#define B_TXT_ATK_NAME 0E
#define B_TXT_ATK_NAME_WITH_PREFIX 0F
#define B_TXT_DEF_NAME_WITH_PREFIX 10
#define B_TXT_EFF_NAME_WITH_PREFIX 11 // EFF = short for gEffectBank
#define B_TXT_SCR_ACTIVE_NAME_WITH_PREFIX 12
#define B_TXT_ACTIVE_NAME_WITH_PREFIX 13
#define B_TXT_CURRENT_MOVE 14
#define B_TXT_LAST_MOVE 15
#define B_TXT_LAST_ITEM 16
#define B_TXT_LAST_ABILITY 17
#define B_TXT_ATK_ABILITY 18
#define B_TXT_DEF_ABILITY 19
#define B_TXT_SCR_ACTIVE_ABILITY 1A
#define B_TXT_EFF_ABILITY 1B
#define B_TXT_TRAINER1_CLASS 1C
#define B_TXT_TRAINER1_NAME 1D
#define B_TXT_1E 1E // trainer name for a link player
#define B_TXT_1F 1F // trainer name for a link player
#define B_TXT_20 20 // trainer name for a link player
#define B_TXT_21 21 // trainer name for a link player
#define B_TXT_22 22 // trainer name for a link player
#define B_TXT_PLAYER_NAME 23
#define B_TXT_TRAINER1_LOSE_TEXT 24
#define B_TXT_TRAINER1_WIN_TEXT 25
#define B_TXT_26 26
#define B_TXT_PC_CREATOR_NAME 27
#define B_TXT_ATK_PREFIX1 28
#define B_TXT_DEF_PREFIX1 29
#define B_TXT_ATK_PREFIX2 2A
#define B_TXT_DEF_PREFIX2 2B
#define B_TXT_ATK_PREFIX3 2C
#define B_TXT_DEF_PREFIX3 2D
#define B_TXT_TRAINER2_CLASS 2E
#define B_TXT_TRAINER2_NAME 2F
#define B_TXT_TRAINER2_LOSE_TEXT 30
#define B_TXT_TRAINER2_WIN_TEXT 31
#define B_TXT_PARTNER_CLASS 32
#define B_TXT_PARTNER_NAME 33
#define B_TXT_BUFF3 34
#define B_TXT_BUFF1 0x0
#define B_TXT_BUFF2 0x1
#define B_TXT_COPY_VAR_1 0x2
#define B_TXT_COPY_VAR_2 0x3
#define B_TXT_COPY_VAR_3 0x4
#define B_TXT_PLAYER_MON1_NAME 0x5
#define B_TXT_OPPONENT_MON1_NAME 0x6
#define B_TXT_PLAYER_MON2_NAME 0x7
#define B_TXT_OPPONENT_MON2_NAME 0x8
#define B_TXT_LINK_PLAYER_MON1_NAME 0x9
#define B_TXT_LINK_OPPONENT_MON1_NAME 0xA
#define B_TXT_LINK_PLAYER_MON2_NAME 0xB
#define B_TXT_LINK_OPPONENT_MON2_NAME 0xC
#define B_TXT_ATK_NAME_WITH_PREFIX_MON1 0xD
#define B_TXT_ATK_PARTNER_NAME 0xE
#define B_TXT_ATK_NAME_WITH_PREFIX 0xF
#define B_TXT_DEF_NAME_WITH_PREFIX 0x10
#define B_TXT_EFF_NAME_WITH_PREFIX 0x11 // EFF = short for gEffectBank
#define B_TXT_ACTIVE_NAME_WITH_PREFIX 0x12
#define B_TXT_SCR_ACTIVE_NAME_WITH_PREFIX 0x13
#define B_TXT_CURRENT_MOVE 0x14
#define B_TXT_LAST_MOVE 0x15
#define B_TXT_LAST_ITEM 0x16
#define B_TXT_LAST_ABILITY 0x17
#define B_TXT_ATK_ABILITY 0x18
#define B_TXT_DEF_ABILITY 0x19
#define B_TXT_SCR_ACTIVE_ABILITY 0x1A
#define B_TXT_EFF_ABILITY 0x1B
#define B_TXT_TRAINER1_CLASS 0x1C
#define B_TXT_TRAINER1_NAME 0x1D
#define B_TXT_1E 0x1E // trainer name for a link player
#define B_TXT_1F 0x1F // trainer name for a link player
#define B_TXT_20 0x20 // trainer name for a link player
#define B_TXT_21 0x21 // trainer name for a link player
#define B_TXT_22 0x22 // trainer name for a link player
#define B_TXT_PLAYER_NAME 0x23
#define B_TXT_TRAINER1_LOSE_TEXT 0x24
#define B_TXT_TRAINER1_WIN_TEXT 0x25
#define B_TXT_26 0x26
#define B_TXT_PC_CREATOR_NAME 0x27
#define B_TXT_ATK_PREFIX1 0x28
#define B_TXT_DEF_PREFIX1 0x29
#define B_TXT_ATK_PREFIX2 0x2A
#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
// for B_TXT_BUFF1, B_TXT_BUFF2 and B_TXT_BUFF3
@ -205,12 +205,22 @@ void BufferStringBattle(u16 stringID);
u32 BattleStringExpandPlaceholdersToDisplayedString(const u8* src);
u32 BattleStringExpandPlaceholders(const u8* src, u8* dst);
void sub_814F9EC(const u8* text, u8 arg1);
void SetPpNumbersPaletteInMoveSelection(void);
u8 GetCurrentPpToMaxPpState(u8 currentPp, u8 maxPp);
extern u8 gBattleTextBuff1[];
extern u8 gBattleTextBuff2[];
extern u8 gBattleTextBuff3[];
extern u8 gDisplayedStringBattle[];
#define TEXT_BUFF_ARRAY_COUNT 16
extern u8 gDisplayedStringBattle[300];
extern u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT];
extern u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT];
extern u8 gBattleTextBuff3[TEXT_BUFF_ARRAY_COUNT];
extern const u8* const gStatNamesTable[];
extern const u8* const gPokeblockWasTooXStringTable[];
extern const u8* const gRefereeStringsTable[];
extern const u8* const gStatNamesTable2[];
extern const u16 gMissStringIds[];
extern const u16 gTrappingMoves[];
#endif // GUARD_BATTLE_MESSAGE_H

387
include/battle_string_ids.h Normal file
View File

@ -0,0 +1,387 @@
#ifndef GUARD_BATTLE_STRING_IDS_H
#define GUARD_BATTLE_STRING_IDS_H
#define BATTLESTRINGS_COUNT 369
#define BATTLESTRINGS_ID_ADDER 12 // all battlestrings have its ID + 12, because first 5 are reserved
#define STRINGID_INTROMSG 0
#define STRINGID_INTROSENDOUT 1
#define STRINGID_RETURNMON 2
#define STRINGID_SWITCHINMON 3
#define STRINGID_USEDMOVE 4
#define STRINGID_BATTLEEND 5
// todo: make some of those names less vague: attacker/target vs pkmn, etc.
#define STRINGID_TRAINER1LOSETEXT 12
#define STRINGID_PKMNGAINEDEXP 13
#define STRINGID_PKMNGREWTOLV 14
#define STRINGID_PKMNLEARNEDMOVE 15
#define STRINGID_TRYTOLEARNMOVE1 16
#define STRINGID_TRYTOLEARNMOVE2 17
#define STRINGID_TRYTOLEARNMOVE3 18
#define STRINGID_PKMNFORGOTMOVE 19
#define STRINGID_STOPLEARNINGMOVE 20
#define STRINGID_DIDNOTLEARNMOVE 21
#define STRINGID_PKMNLEARNEDMOVE2 22
#define STRINGID_ATTACKMISSED 23
#define STRINGID_PKMNPROTECTEDITSELF 24
#define STRINGID_STATSWONTINCREASE2 25
#define STRINGID_AVOIDEDDAMAGE 26
#define STRINGID_ITDOESNTAFFECT 27
#define STRINGID_ATTACKERFAINTED 28
#define STRINGID_TARGETFAINTED 29
#define STRINGID_PLAYERGOTMONEY 30
#define STRINGID_PLAYERWHITEOUT 31
#define STRINGID_PLAYERWHITEOUT2 32
#define STRINGID_PREVENTSESCAPE 33
#define STRINGID_HITXTIMES 34
#define STRINGID_PKMNFELLASLEEP 35
#define STRINGID_PKMNMADESLEEP 36
#define STRINGID_PKMNALREADYASLEEP 37
#define STRINGID_PKMNALREADYASLEEP2 38
#define STRINGID_PKMNWASNTAFFECTED 39
#define STRINGID_PKMNWASPOISONED 40
#define STRINGID_PKMNPOISONEDBY 41
#define STRINGID_PKMNHURTBYPOISON 42
#define STRINGID_PKMNALREADYPOISONED 43
#define STRINGID_PKMNBADLYPOISONED 44
#define STRINGID_PKMNENERGYDRAINED 45
#define STRINGID_PKMNWASBURNED 46
#define STRINGID_PKMNBURNEDBY 47
#define STRINGID_PKMNHURTBYBURN 48
#define STRINGID_PKMNWASFROZEN 49
#define STRINGID_PKMNFROZENBY 50
#define STRINGID_PKMNISFROZEN 51
#define STRINGID_PKMNWASDEFROSTED 52
#define STRINGID_PKMNWASDEFROSTED2 53
#define STRINGID_PKMNWASDEFROSTEDBY 54
#define STRINGID_PKMNWASPARALYZED 55
#define STRINGID_PKMNWASPARALYZEDBY 56
#define STRINGID_PKMNISPARALYZED 57
#define STRINGID_PKMNISALREADYPARALYZED 58
#define STRINGID_PKMNHEALEDPARALYSIS 59
#define STRINGID_PKMNDREAMEATEN 60
#define STRINGID_STATSWONTINCREASE 61
#define STRINGID_STATSWONTDECREASE 62
#define STRINGID_TEAMSTOPPEDWORKING 63
#define STRINGID_FOESTOPPEDWORKING 64
#define STRINGID_PKMNISCONFUSED 65
#define STRINGID_PKMNHEALEDCONFUSION 66
#define STRINGID_PKMNWASCONFUSED 67
#define STRINGID_PKMNALREADYCONFUSED 68
#define STRINGID_PKMNFELLINLOVE 69
#define STRINGID_PKMNINLOVE 70
#define STRINGID_PKMNIMMOBILIZEDBYLOVE 71
#define STRINGID_PKMNBLOWNAWAY 72
#define STRINGID_PKMNCHANGEDTYPE 73
#define STRINGID_PKMNFLINCHED 74
#define STRINGID_PKMNREGAINEDHEALTH 75
#define STRINGID_PKMNHPFULL 76
#define STRINGID_PKMNRAISEDSPDEF 77
#define STRINGID_PKMNRAISEDDEF 78
#define STRINGID_PKMNCOVEREDBYVEIL 79
#define STRINGID_PKMNUSEDSAFEGUARD 80
#define STRINGID_PKMNSAFEGUARDEXPIRED 81
#define STRINGID_PKMNWENTTOSLEEP 82
#define STRINGID_PKMNSLEPTHEALTHY 83
#define STRINGID_PKMNWHIPPEDWHIRLWIND 84
#define STRINGID_PKMNTOOKSUNLIGHT 85
#define STRINGID_PKMNLOWEREDHEAD 86
#define STRINGID_PKMNISGLOWING 87
#define STRINGID_PKMNFLEWHIGH 88
#define STRINGID_PKMNDUGHOLE 89
#define STRINGID_PKMNSQUEEZEDBYBIND 90
#define STRINGID_PKMNTRAPPEDINVORTEX 91
#define STRINGID_PKMNWRAPPEDBY 92
#define STRINGID_PKMNCLAMPED 93
#define STRINGID_PKMNHURTBY 94
#define STRINGID_PKMNFREEDFROM 95
#define STRINGID_PKMNCRASHED 96
#define STRINGID_PKMNSHROUDEDINMIST 97
#define STRINGID_PKMNPROTECTEDBYMIST 98
#define STRINGID_PKMNGETTINGPUMPED 99
#define STRINGID_PKMNHITWITHRECOIL 100
#define STRINGID_PKMNPROTECTEDITSELF2 101
#define STRINGID_PKMNBUFFETEDBYSANDSTORM 102
#define STRINGID_PKMNPELTEDBYHAIL 103
#define STRINGID_PKMNSEEDED 104
#define STRINGID_PKMNEVADEDATTACK 105
#define STRINGID_PKMNSAPPEDBYLEECHSEED 106
#define STRINGID_PKMNFASTASLEEP 107
#define STRINGID_PKMNWOKEUP 108
#define STRINGID_PKMNUPROARKEPTAWAKE 109
#define STRINGID_PKMNWOKEUPINUPROAR 110
#define STRINGID_PKMNCAUSEDUPROAR 111
#define STRINGID_PKMNMAKINGUPROAR 112
#define STRINGID_PKMNCALMEDDOWN 113
#define STRINGID_PKMNCANTSLEEPINUPROAR 114
#define STRINGID_PKMNSTOCKPILED 115
#define STRINGID_PKMNCANTSTOCKPILE 116
#define STRINGID_PKMNCANTSLEEPINUPROAR2 117
#define STRINGID_UPROARKEPTPKMNAWAKE 118
#define STRINGID_PKMNSTAYEDAWAKEUSING 119
#define STRINGID_PKMNSTORINGENERGY 120
#define STRINGID_PKMNUNLEASHEDENERGY 121
#define STRINGID_PKMNFATIGUECONFUSION 122
#define STRINGID_PKMNPICKEDUPITEM 123
#define STRINGID_PKMNUNAFFECTED 124
#define STRINGID_PKMNTRANSFORMEDINTO 125
#define STRINGID_PKMNMADESUBSTITUTE 126
#define STRINGID_PKMNHASSUBSTITUTE 127
#define STRINGID_SUBSTITUTEDAMAGED 128
#define STRINGID_PKMNSUBSTITUTEFADED 129
#define STRINGID_PKMNMUSTRECHARGE 130
#define STRINGID_PKMNRAGEBUILDING 131
#define STRINGID_PKMNMOVEWASDISABLED 132
#define STRINGID_PKMNMOVEISDISABLED 133
#define STRINGID_PKMNMOVEDISABLEDNOMORE 134
#define STRINGID_PKMNGOTENCORE 135
#define STRINGID_PKMNENCOREENDED 136
#define STRINGID_PKMNTOOKAIM 137
#define STRINGID_PKMNSKETCHEDMOVE 138
#define STRINGID_PKMNTRYINGTOTAKEFOE 139
#define STRINGID_PKMNTOOKFOE 140
#define STRINGID_PKMNREDUCEDPP 141
#define STRINGID_PKMNSTOLEITEM 142
#define STRINGID_TARGETCANTESCAPENOW 143
#define STRINGID_PKMNFELLINTONIGHTMARE 144
#define STRINGID_PKMNLOCKEDINNIGHTMARE 145
#define STRINGID_PKMNLAIDCURSE 146
#define STRINGID_PKMNAFFLICTEDBYCURSE 147
#define STRINGID_SPIKESSCATTERED 148
#define STRINGID_PKMNHURTBYSPIKES 149
#define STRINGID_PKMNIDENTIFIED 150
#define STRINGID_PKMNPERISHCOUNTFELL 151
#define STRINGID_PKMNBRACEDITSELF 152
#define STRINGID_PKMNENDUREDHIT 153
#define STRINGID_MAGNITUDESTRENGTH 154
#define STRINGID_PKMNCUTHPMAXEDATTACK 155
#define STRINGID_PKMNCOPIEDSTATCHANGES 156
#define STRINGID_PKMNGOTFREE 157
#define STRINGID_PKMNSHEDLEECHSEED 158
#define STRINGID_PKMNBLEWAWAYSPIKES 159
#define STRINGID_PKMNFLEDFROMBATTLE 160
#define STRINGID_PKMNFORESAWATTACK 161
#define STRINGID_PKMNTOOKATTACK 162
#define STRINGID_PKMNATTACK 163
#define STRINGID_PKMNCENTERATTENTION 164
#define STRINGID_PKMNCHARGINGPOWER 165
#define STRINGID_NATUREPOWERTURNEDINTO 166
#define STRINGID_PKMNSTATUSNORMAL 167
#define STRINGID_PKMNHASNOMOVESLEFT 168
#define STRINGID_PKMNSUBJECTEDTOTORMENT 169
#define STRINGID_PKMNCANTUSEMOVETORMENT 170
#define STRINGID_PKMNTIGHTENINGFOCUS 171
#define STRINGID_PKMNFELLFORTAUNT 172
#define STRINGID_PKMNCANTUSEMOVETAUNT 173
#define STRINGID_PKMNREADYTOHELP 174
#define STRINGID_PKMNSWITCHEDITEMS 175
#define STRINGID_PKMNCOPIEDFOE 176
#define STRINGID_PKMNMADEWISH 177
#define STRINGID_PKMNWISHCAMETRUE 178
#define STRINGID_PKMNPLANTEDROOTS 179
#define STRINGID_PKMNABSORBEDNUTRIENTS 180
#define STRINGID_PKMNANCHOREDITSELF 181
#define STRINGID_PKMNWASMADEDROWSY 182
#define STRINGID_PKMNKNOCKEDOFF 183
#define STRINGID_PKMNSWAPPEDABILITIES 184
#define STRINGID_PKMNSEALEDOPPONENTMOVE 185
#define STRINGID_PKMNCANTUSEMOVESEALED 186
#define STRINGID_PKMNWANTSGRUDGE 187
#define STRINGID_PKMNLOSTPPGRUDGE 188
#define STRINGID_PKMNSHROUDEDITSELF 189
#define STRINGID_PKMNMOVEBOUNCED 190
#define STRINGID_PKMNWAITSFORTARGET 191
#define STRINGID_PKMNSNATCHEDMOVE 192
#define STRINGID_PKMNMADEITRAIN 193
#define STRINGID_PKMNRAISEDSPEED 194
#define STRINGID_PKMNPROTECTEDBY 195
#define STRINGID_PKMNPREVENTSUSAGE 196
#define STRINGID_PKMNRESTOREDHPUSING 197
#define STRINGID_PKMNCHANGEDTYPEWITH 198
#define STRINGID_PKMNPREVENTSPARALYSISWITH 199
#define STRINGID_PKMNPREVENTSROMANCEWITH 200
#define STRINGID_PKMNPREVENTSPOISONINGWITH 201
#define STRINGID_PKMNPREVENTSCONFUSIONWITH 202
#define STRINGID_PKMNRAISEDFIREPOWERWITH 203
#define STRINGID_PKMNANCHORSITSELFWITH 204
#define STRINGID_PKMNCUTSATTACKWITH 205
#define STRINGID_PKMNPREVENTSSTATLOSSWITH 206
#define STRINGID_PKMNHURTSWITH 207
#define STRINGID_PKMNTRACED 208
#define STRINGID_STATSHARPLY 209
#define STRINGID_STATROSE 210
#define STRINGID_STATHARSHLY 211
#define STRINGID_STATFELL 212
#define STRINGID_PKMNSSTATCHANGED 213
#define STRINGID_PKMNSSTATCHANGED2 214
#define STRINGID_PKMNSSTATCHANGED3 215
#define STRINGID_PKMNSSTATCHANGED4 216
#define STRINGID_CRITICALHIT 217
#define STRINGID_ONEHITKO 218
#define STRINGID_123POOF 219
#define STRINGID_ANDELLIPSIS 220
#define STRINGID_NOTVERYEFFECTIVE 221
#define STRINGID_SUPEREFFECTIVE 222
#define STRINGID_GOTAWAYSAFELY 223
#define STRINGID_WILDPKMNFLED 224
#define STRINGID_NORUNNINGFROMTRAINERS 225
#define STRINGID_CANTESCAPE 226
#define STRINGID_DONTLEAVEBIRCH 227
#define STRINGID_BUTNOTHINGHAPPENED 228
#define STRINGID_BUTITFAILED 229
#define STRINGID_ITHURTCONFUSION 230
#define STRINGID_MIRRORMOVEFAILED 231
#define STRINGID_STARTEDTORAIN 232
#define STRINGID_DOWNPOURSTARTED 233
#define STRINGID_RAINCONTINUES 234
#define STRINGID_DOWNPOURCONTINUES 235
#define STRINGID_RAINSTOPPED 236
#define STRINGID_SANDSTORMBREWED 237
#define STRINGID_SANDSTORMRAGES 238
#define STRINGID_SANDSTORMSUBSIDED 239
#define STRINGID_SUNLIGHTGOTBRIGHT 240
#define STRINGID_SUNLIGHTSTRONG 241
#define STRINGID_SUNLIGHTFADED 242
#define STRINGID_STARTEDHAIL 243
#define STRINGID_HAILCONTINUES 244
#define STRINGID_HAILSTOPPED 245
#define STRINGID_FAILEDTOSPITUP 246
#define STRINGID_FAILEDTOSWALLOW 247
#define STRINGID_WINDBECAMEHEATWAVE 248
#define STRINGID_STATCHANGESGONE 249
#define STRINGID_COINSSCATTERED 250
#define STRINGID_TOOWEAKFORSUBSTITUTE 251
#define STRINGID_SHAREDPAIN 252
#define STRINGID_BELLCHIMED 253
#define STRINGID_FAINTINTHREE 254
#define STRINGID_NOPPLEFT 255
#define STRINGID_BUTNOPPLEFT 256
#define STRINGID_PLAYERUSEDITEM 257
#define STRINGID_WALLYUSEDITEM 258
#define STRINGID_TRAINERBLOCKEDBALL 259
#define STRINGID_DONTBEATHIEF 260
#define STRINGID_ITDODGEDBALL 261
#define STRINGID_YOUMISSEDPKMN 262
#define STRINGID_PKMNBROKEFREE 263
#define STRINGID_ITAPPEAREDCAUGHT 264
#define STRINGID_AARGHALMOSTHADIT 265
#define STRINGID_SHOOTSOCLOSE 266
#define STRINGID_GOTCHAPKMNCAUGHT 267
#define STRINGID_GOTCHAPKMNCAUGHT2 268
#define STRINGID_GIVENICKNAMECAPTURED 269
#define STRINGID_PKMNSENTTOPC 270
#define STRINGID_PKMNDATAADDEDTODEX 271
#define STRINGID_ITISRAINING 272
#define STRINGID_SANDSTORMISRAGING 273
#define STRINGID_CANTESCAPE2 274
#define STRINGID_PKMNIGNORESASLEEP 275
#define STRINGID_PKMNIGNOREDORDERS 276
#define STRINGID_PKMNBEGANTONAP 277
#define STRINGID_PKMNLOAFING 278
#define STRINGID_PKMNWONTOBEY 279
#define STRINGID_PKMNTURNEDAWAY 280
#define STRINGID_PKMNPRETENDNOTNOTICE 281
#define STRINGID_ENEMYABOUTTOSWITCHPKMN 282
#define STRINGID_CREPTCLOSER 283
#define STRINGID_CANTGETCLOSER 284
#define STRINGID_PKMNWATCHINGCAREFULLY 285
#define STRINGID_PKMNCURIOUSABOUTX 286
#define STRINGID_PKMNENTHRALLEDBYX 287
#define STRINGID_PKMNIGNOREDX 288
#define STRINGID_THREWPOKEBLOCKATPKMN 289
#define STRINGID_OUTOFSAFARIBALLS 290
#define STRINGID_PKMNSITEMCUREDPARALYSIS 291
#define STRINGID_PKMNSITEMCUREDPOISON 292
#define STRINGID_PKMNSITEMHEALEDBURN 293
#define STRINGID_PKMNSITEMDEFROSTEDIT 294
#define STRINGID_PKMNSITEMWOKEIT 295
#define STRINGID_PKMNSITEMSNAPPEDOUT 296
#define STRINGID_PKMNSITEMCUREDPROBLEM 297
#define STRINGID_PKMNSITEMRESTOREDHEALTH 298
#define STRINGID_PKMNSITEMRESTOREDPP 299
#define STRINGID_PKMNSITEMRESTOREDSTATUS 300
#define STRINGID_PKMNSITEMRESTOREDHPALITTLE 301
#define STRINGID_ITEMALLOWSONLYYMOVE 302
#define STRINGID_PKMNHUNGONWITHX 303
#define STRINGID_EMPTYSTRING3 304
#define STRINGID_PKMNSXPREVENTSBURNS 305
#define STRINGID_PKMNSXBLOCKSY 306
#define STRINGID_PKMNSXRESTOREDHPALITTLE2 307
#define STRINGID_PKMNSXWHIPPEDUPSANDSTORM 308
#define STRINGID_PKMNSXPREVENTSYLOSS 309
#define STRINGID_PKMNSXINFATUATEDY 310
#define STRINGID_PKMNSXMADEYINEFFECTIVE 311
#define STRINGID_PKMNSXCUREDYPROBLEM 312
#define STRINGID_ITSUCKEDLIQUIDOOZE 313
#define STRINGID_PKMNTRANSFORMED 314
#define STRINGID_ELECTRICITYWEAKENED 315
#define STRINGID_FIREWEAKENED 316
#define STRINGID_PKMNHIDUNDERWATER 317
#define STRINGID_PKMNSPRANGUP 318
#define STRINGID_HMMOVESCANTBEFORGOTTEN 319
#define STRINGID_XFOUNDONEY 320
#define STRINGID_PLAYERDEFEATEDTRAINER1 321
#define STRINGID_SOOTHINGAROMA 322
#define STRINGID_ITEMSCANTBEUSEDNOW 323
#define STRINGID_FORXCOMMAYZ 324
#define STRINGID_USINGXTHEYOFZN 325
#define STRINGID_PKMNUSEDXTOGETPUMPED 326
#define STRINGID_PKMNSXMADEYUSELESS 327
#define STRINGID_PKMNTRAPPEDBYSANDTOMB 328
#define STRINGID_EMPTYSTRING4 329
#define STRINGID_ABOOSTED 330
#define STRINGID_PKMNSXINTENSIFIEDSUN 331
#define STRINGID_PKMNMAKESGROUNDMISS 332
#define STRINGID_YOUTHROWABALLNOWRIGHT 333
#define STRINGID_PKMNSXTOOKATTACK 334
#define STRINGID_PKMNCHOSEXASDESTINY 335
#define STRINGID_PKMNLOSTFOCUS 336
#define STRINGID_USENEXTPKMN 337
#define STRINGID_PKMNFLEDUSINGITS 338
#define STRINGID_PKMNFLEDUSING 339
#define STRINGID_PKMNWASDRAGGEDOUT 340
#define STRINGID_PREVENTEDFROMWORKING 341
#define STRINGID_PKMNSITEMNORMALIZEDSTATUS 342
#define STRINGID_TRAINER1USEDITEM 343
#define STRINGID_BOXISFULL 344
#define STRINGID_PKMNAVOIDEDATTACK 345
#define STRINGID_PKMNSXMADEITINEFFECTIVE 346
#define STRINGID_PKMNSXPREVENTSFLINCHING 347
#define STRINGID_PKMNALREADYHASBURN 348
#define STRINGID_STATSWONTDECREASE2 349
#define STRINGID_PKMNSXBLOCKSY2 350
#define STRINGID_PKMNSXWOREOFF 351
#define STRINGID_PKMNRAISEDDEFALITTLE 352
#define STRINGID_PKMNRAISEDSPDEFALITTLE 353
#define STRINGID_THEWALLSHATTERED 354
#define STRINGID_PKMNSXPREVENTSYSZ 355
#define STRINGID_PKMNSXCUREDITSYPROBLEM 356
#define STRINGID_ATTACKERCANTESCAPE 357
#define STRINGID_PKMNOBTAINEDX 358
#define STRINGID_PKMNOBTAINEDX2 359
#define STRINGID_PKMNOBTAINEDXYOBTAINEDZ 360
#define STRINGID_BUTNOEFFECT 361
#define STRINGID_PKMNSXHADNOEFFECTONY 362
#define STRINGID_TWOENEMIESDEFEATED 363
#define STRINGID_TRAINER2LOSETEXT 364
#define STRINGID_PKMNINCAPABLEOFPOWER 365
#define STRINGID_GLINTAPPEARSINEYE 366
#define STRINGID_PKMNGETTINGINTOPOSITION 367
#define STRINGID_PKMNBEGANGROWLINGDEEPLY 368
#define STRINGID_PKMNEAGERFORMORE 369
#define STRINGID_DEFEATEDOPPONENTBYREFEREE 370
#define STRINGID_LOSTTOOPPONENTBYREFEREE 371
#define STRINGID_TIEDOPPONENTBYREFEREE 372
#define STRINGID_QUESTIONFORFEITMATCH 373
#define STRINGID_FORFEITEDMATCH 374
#define STRINGID_PKMNTRANSFERREDSOMEONESPC 375
#define STRINGID_PKMNTRANSFERREDLANETTESPC 376
#define STRINGID_PKMNBOXSOMEONESPCFULL 377
#define STRINGID_PKMNBOXLANETTESPCFULL 378
#define STRINGID_TRAINER1WINTEXT 379
#define STRINGID_TRAINER2WINTEXT 380
#endif // GUARD_BATTLE_STRING_IDS_H

View File

@ -225,24 +225,25 @@ extern struct SaveBlock2 *gSaveBlock2Ptr;
struct SecretBaseRecord
{
/*ID?*/ /*0x1A08*/ u8 sbr_field_0;
/*0x1A09*/ u8 sbr_field_1_0:4;
/*0x1A09*/ u8 gender:1;
/*0x1A09*/ u8 sbr_field_1_5:1;
/*0x1A09*/ u8 sbr_field_1_6:2;
/*0x1A0A*/ u8 sbr_field_2[7]; // 0xFF bytes?
/*0x1A12*/ u8 trainerId[4]; // byte 0 is used for determining trainer class
/*0x1A16*/ u16 sbr_field_e;
/*0x1A18*/ u8 sbr_field_10;
/*0x1A19*/ u8 sbr_field_11;
/*0x1A1A*/ u8 decorations[16];
/*0x1A2A*/ u8 decorationPos[16];
/*0x1A3A*/ u32 partyPersonality[6];
/*0x1A54*/ u16 partyMoves[6 * 4];
/*0x1A84*/ u16 partySpecies[6];
/*0x1A90*/ u16 partyHeldItems[6];
/*0x1A9C*/ u8 partyLevels[6];
/*0x1AA2*/ u8 partyEVs[6];
u8 sbr_field_0;
u8 sbr_field_1_0:4;
u8 gender:1;
u8 sbr_field_1_5:1;
u8 sbr_field_1_6:2;
u8 trainerName[7];
u8 trainerId[4]; // byte 0 is used for determining trainer class
u8 language;
u16 sbr_field_e;
u8 sbr_field_10;
u8 sbr_field_11;
u8 decorations[16];
u8 decorationPos[16];
u32 partyPersonality[6];
u16 partyMoves[6 * 4];
u16 partySpecies[6];
u16 partyHeldItems[6];
u8 partyLevels[6];
u8 partyEVs[6];
};
#include "game_stat.h"

9
include/save_location.h Normal file
View File

@ -0,0 +1,9 @@
#ifndef GUARD_SAVE_LOCATION_H
#define GUARD_SAVE_LOCATION_H
bool32 sub_81AFCEC(void);
void TrySetMapSaveWarpStatus(void);
void sub_81AFDA0(void);
void sub_81AFDD0(void);
#endif // GUARD_SAVE_LOCATION_H

View File

@ -103,7 +103,7 @@ struct TextPrinterSubStruct
struct TextSubPrinter // TODO: Better name
{
u8* current_text_offset;
const u8* current_text_offset;
u8 windowId;
u8 fontId;
u8 x;

View File

@ -123,7 +123,6 @@ SECTIONS {
asm/battle_setup.o(.text);
asm/cable_club.o(.text);
asm/trainer_see.o(.text);
asm/fldeff_emotion.o(.text);
asm/wild_encounter.o(.text);
asm/field_effect.o(.text);
asm/unknown_task.o(.text);
@ -190,7 +189,7 @@ SECTIONS {
asm/fldeff_strength.o(.text);
asm/battle_transition.o(.text);
asm/battle_controller_linkpartner.o(.text);
asm/battle_message.o(.text);
src/battle_message.o(.text);
asm/cable_car.o(.text);
asm/math_util.o(.text);
asm/roulette_util.o(.text);
@ -324,6 +323,8 @@ SECTIONS {
src/string_util.o(.rodata);
data/link.o(.rodata);
src/rtc.o(.rodata);
data/main_menu.o(.rodata);
data/battle_1.o(.rodata);
data/data2b.o(.rodata);
src/battle_2.o(.rodata);
src/battle_util.o(.rodata);
@ -367,7 +368,6 @@ SECTIONS {
data/battle_setup.o(.rodata);
data/cable_club.o(.rodata);
data/trainer_see.o(.rodata);
data/fldeff_emotion.o(.rodata);
data/wild_encounter.o(.rodata);
data/field_effect.o(.rodata);
data/option_menu.o(.rodata);
@ -411,7 +411,7 @@ SECTIONS {
src/battle_ai_script_commands.o(.rodata);
data/data4.o(.rodata);
data/battle_controller_link_partner.o(.rodata);
data/battle_message.o(.rodata);
src/battle_message.o(.rodata);
data/cable_car.o(.rodata);
data/save.o(.rodata);
data/field_effect_helpers.o(.rodata);

View File

@ -41,6 +41,7 @@
#include "evolution_scene.h"
#include "roamer.h"
#include "safari_zone.h"
#include "battle_string_ids.h"
struct UnknownStruct6
{
@ -245,7 +246,7 @@ static void sub_8038F34(void);
static void sub_80392A8(void);
static void sub_803937C(void);
static void sub_803939C(void);
static void oac_poke_opponent(struct Sprite *sprite);
void oac_poke_opponent(struct Sprite *sprite);
static void sub_803980C(struct Sprite *sprite);
static void sub_8039838(struct Sprite *sprite);
static void sub_8039894(struct Sprite *sprite);
@ -343,7 +344,7 @@ const u8 gStatusConditionString_IceJpn[8] = _("こおり$$$$");
const u8 gStatusConditionString_ConfusionJpn[8] = _("こんらん$$$");
const u8 gStatusConditionString_LoveJpn[8] = _("メロメロ$$$");
const u8 * const gStatusConditionStringsTable[][2] =
const u8 * const gStatusConditionStringsTable[7][2] =
{
{gStatusConditionString_PoisonJpn, gText_Poison},
{gStatusConditionString_SleepJpn, gText_Sleep},
@ -1650,7 +1651,7 @@ void CB2_QuitRecordedBattle(void)
}
}
static void sub_8038528(struct Sprite* sprite)
void sub_8038528(struct Sprite* sprite)
{
sprite->data0 = 0;
sprite->callback = sub_8038538;
@ -2417,7 +2418,7 @@ u32 sub_80397C4(u32 setId, u32 tableId)
#define tBank data0
#define tSpeciesId data2
static void oac_poke_opponent(struct Sprite *sprite)
void oac_poke_opponent(struct Sprite *sprite)
{
sprite->callback = sub_803980C;
StartSpriteAnimIfDifferent(sprite, 0);
@ -3299,7 +3300,7 @@ static void BattleIntroPrintTrainerWantsToBattle(void)
if (gBattleExecBuffer == 0)
{
gActiveBank = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
PrepareStringBattle(0, gActiveBank);
PrepareStringBattle(STRINGID_INTROMSG, gActiveBank);
gBattleMainFunc = BattleIntroPrintOpponentSendsOut;
}
}
@ -3309,7 +3310,7 @@ static void BattleIntroPrintWildMonAttacked(void)
if (gBattleExecBuffer == 0)
{
gBattleMainFunc = BattleIntroPrintPlayerSendsOut;
PrepareStringBattle(0, 0);
PrepareStringBattle(STRINGID_INTROMSG, 0);
}
}
@ -3332,7 +3333,7 @@ static void BattleIntroPrintOpponentSendsOut(void)
else
identity = IDENTITY_OPPONENT_MON1;
PrepareStringBattle(1, GetBankByIdentity(identity));
PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByIdentity(identity));
gBattleMainFunc = BattleIntroOpponent1SendsOutMonAnimation;
}
@ -3535,7 +3536,7 @@ static void BattleIntroPrintPlayerSendsOut(void)
identity = IDENTITY_PLAYER_MON1;
if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
PrepareStringBattle(1, GetBankByIdentity(identity));
PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByIdentity(identity));
gBattleMainFunc = BattleIntroPlayer1SendsOutMonAnimation;
}
@ -4006,8 +4007,8 @@ static void HandleTurnActionSelectionState(void)
for (i = 0; i < 4; i++)
{
moveInfo.moves[i] = gBattleMons[gActiveBank].moves[i];
moveInfo.ppNumbers[i] = gBattleMons[gActiveBank].pp[i];
moveInfo.ppWithBonusNumbers[i] = CalculatePPWithBonus(
moveInfo.currentPp[i] = gBattleMons[gActiveBank].pp[i];
moveInfo.maxPp[i] = CalculatePPWithBonus(
gBattleMons[gActiveBank].moves[i],
gBattleMons[gActiveBank].ppBonuses,
i);

File diff suppressed because it is too large Load Diff

2333
src/battle_message.c Normal file

File diff suppressed because it is too large Load Diff

View File

@ -34,6 +34,7 @@
#include "pokemon_storage_system.h"
#include "task.h"
#include "naming_screen.h"
#include "battle_string_ids.h"
// variables
@ -1375,7 +1376,7 @@ static void atk02_attackstring(void)
return;
if (!(gHitMarker & (HITMARKER_NO_ATTACKSTRING | HITMARKER_ATTACKSTRING_PRINTED)))
{
PrepareStringBattle(4, gBankAttacker);
PrepareStringBattle(STRINGID_USEDMOVE, gBankAttacker);
gHitMarker |= HITMARKER_ATTACKSTRING_PRINTED;
}
gBattlescriptCurrInstr++;
@ -2000,7 +2001,7 @@ static void atk0B_healthbarupdate(void)
if (gBattleMons[gActiveBank].status2 & STATUS2_SUBSTITUTE && gDisableStructs[gActiveBank].substituteHP && !(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE))
{
PrepareStringBattle(0x80, gActiveBank);
PrepareStringBattle(STRINGID_SUBSTITUTEDAMAGED, gActiveBank);
}
else
{
@ -2157,7 +2158,7 @@ static void atk0D_critmessage(void)
{
if (gCritMultiplier == 2 && !(gBattleMoveFlags & MOVESTATUS_NOEFFECT))
{
PrepareStringBattle(0xD9, gBankAttacker);
PrepareStringBattle(STRINGID_CRITICALHIT, gBankAttacker);
gBattleCommunication[MSG_DISPLAY] = 1;
}
gBattlescriptCurrInstr++;
@ -2229,22 +2230,22 @@ static void atk0F_resultmessage(void)
switch (gBattleMoveFlags & (u8)(~(MOVESTATUS_MISSED)))
{
case MOVESTATUS_SUPEREFFECTIVE:
stringId = 0xDE;
stringId = STRINGID_SUPEREFFECTIVE;
break;
case MOVESTATUS_NOTVERYEFFECTIVE:
stringId = 0xDD;
stringId = STRINGID_NOTVERYEFFECTIVE;
break;
case MOVESTATUS_ONEHITKO:
stringId = 0xDA;
stringId = STRINGID_ONEHITKO;
break;
case MOVESTATUS_ENDURED:
stringId = 0x99;
stringId = STRINGID_PKMNENDUREDHIT;
break;
case MOVESTATUS_FAILED:
stringId = 0xE5;
stringId = STRINGID_BUTITFAILED;
break;
case MOVESTATUS_NOTAFFECTED:
stringId = 0x1B;
stringId = STRINGID_ITDOESNTAFFECT;
break;
case MOVESTATUS_HUNGON:
gLastUsedItem = gBattleMons[gBankTarget].item;
@ -2256,7 +2257,7 @@ static void atk0F_resultmessage(void)
default:
if (gBattleMoveFlags & MOVESTATUS_NOTAFFECTED)
{
stringId = 0x1B;
stringId = STRINGID_ITDOESNTAFFECT;
}
else if (gBattleMoveFlags & MOVESTATUS_ONEHITKO)
{
@ -2285,7 +2286,7 @@ static void atk0F_resultmessage(void)
}
else if (gBattleMoveFlags & MOVESTATUS_FAILED)
{
stringId = 0xE5;
stringId = STRINGID_BUTITFAILED;
}
else
{
@ -3592,7 +3593,7 @@ static void atk23_getexp(void)
PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff3, 5, gBattleMoveDamage)
PrepareStringBattle(0xD, gBattleStruct->expGetterBank);
PrepareStringBattle(STRINGID_PKMNGAINEDEXP, gBattleStruct->expGetterBank);
MonGainEVs(&gPlayerParty[gBattleStruct->expGetterId], gBattleMons[gBank1].species);
}
gBattleStruct->sentInPokes >>= 1;
@ -6181,7 +6182,7 @@ static void atk5A_yesnoboxlearnmove(void)
u16 moveId = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_MOVE1 + movePosition);
if (IsHMMove2(moveId))
{
PrepareStringBattle(0x13F, gActiveBank);
PrepareStringBattle(STRINGID_HMMOVESCANTBEFORGOTTEN, gActiveBank);
gBattleScripting.learnMoveState = 6;
}
else

View File

@ -1,4 +1,5 @@
#include "global.h"
#include "save_location.h"
#include "map_constants.h"
// used to make the list defines a little less ugly.
@ -26,7 +27,7 @@ static bool32 IsCurMapInLocationList(const u16 *list)
}
// TODO: Not require a packed u16 array for these lists
static const u16 gSaveLocationPokeCenterList[] =
static const u16 sSaveLocationPokeCenterList[] =
{
MAP(OLDALE_TOWN_POKEMON_CENTER_1F),
MAP(OLDALE_TOWN_POKEMON_CENTER_2F),
@ -71,10 +72,10 @@ static const u16 gSaveLocationPokeCenterList[] =
static bool32 IsCurMapPokeCenter(void)
{
return IsCurMapInLocationList(gSaveLocationPokeCenterList);
return IsCurMapInLocationList(sSaveLocationPokeCenterList);
}
static const u16 gSaveLocationReloadLocList[] = // there's only 1 location, and it's presumed its for the save reload feature for battle tower
static const u16 sSaveLocationReloadLocList[] = // there's only 1 location, and it's presumed its for the save reload feature for battle tower
{
MAP(BATTLE_TOWER_LOBBY),
0xFFFF,
@ -82,18 +83,18 @@ static const u16 gSaveLocationReloadLocList[] = // there's only 1 location, and
static bool32 IsCurMapReloadLocation(void)
{
return IsCurMapInLocationList(gSaveLocationReloadLocList);
return IsCurMapInLocationList(sSaveLocationReloadLocList);
}
// nulled out list. unknown what this would have been
static const u16 gUnknown_0861440E[] =
static const u16 sUnknown_0861440E[] =
{
0xFFFF,
};
bool32 sub_81AFCEC(void)
{
return IsCurMapInLocationList(gUnknown_0861440E);
return IsCurMapInLocationList(sUnknown_0861440E);
}
static void TrySetPokeCenterWarpStatus(void)

View File

@ -112,7 +112,7 @@ static const u16 sCrc16Table[] =
0x7BC7, 0x6A4E, 0x58D5, 0x495C, 0x3DE3, 0x2C6A, 0x1EF1, 0x0F78,
};
const u8 gMiscBlank_Gfx[] = INCBIN_U8("graphics/interface/blank.4bpp"); // unused in Emerald
const u8 gMiscBlank_Gfx[] = INCBIN_U8("graphics/interface/blank.4bpp");
u8 CreateInvisibleSpriteWithCallback(void (*callback)(struct Sprite *))
{

View File

@ -238,26 +238,7 @@ gBattle_WIN1H: @ 2022E28
gBattle_WIN1V: @ 2022E2A
.space 0x2
gDisplayedStringBattle: @ 2022E2C
.space 0x12C
gBattleTextBuff1: @ 2022F58
.space 0x2
gUnknown_02022F5A: @ 2022F5A
.space 0x2
gUnknown_02022F5C: @ 2022F5C
.space 0xC
gBattleTextBuff2: @ 2022F68
.space 0x2
gUnknown_02022F6A: @ 2022F6A
.space 0xE
gBattleTextBuff3: @ 2022F78
.space 0x10
.include "src/battle_message.o"
gUnknown_02022F88: @ 2022F88
.space 0x64