dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

convert comments (; -> @)

Browse Source
This commit is contained in:
YamaArashi
2016-09-02 19:51:16 -07:00
parent bc10815b94
commit 7bef2a2783
158 changed files with 65183 additions and 65183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/charmap.s
+7 -7
View File
@@ -85,7 +85,7 @@
.charmap ":", 0xF0 .charmap ":", 0xF0
.charmap "$", 0xFF .charmap "$", 0xFF
; Hiragana @ Hiragana
.charmap "あ", 0x01 .charmap "あ", 0x01
.charmap "い", 0x02 .charmap "い", 0x02
.charmap "う", 0x03 .charmap "う", 0x03
@@ -167,7 +167,7 @@
.charmap "ぽ", 0x4F .charmap "ぽ", 0x4F
.charmap "っ", 0x50 .charmap "っ", 0x50
; Katakana @ Katakana
.charmap "ア", 0x51 .charmap "ア", 0x51
.charmap "イ", 0x52 .charmap "イ", 0x52
.charmap "ウ", 0x53 .charmap "ウ", 0x53
@@ -253,16 +253,16 @@
.charmapconst PKMN, 0x53, 0x54 .charmapconst PKMN, 0x53, 0x54
.charmapconst POKEBLOCK, 0x55, 0x56, 0x57, 0x58, 0x59 .charmapconst POKEBLOCK, 0x55, 0x56, 0x57, 0x58, 0x59
; string refs @ string refs
; unknown (0xFD, 0x00) @ unknown (0xFD, 0x00)
.charmapconst PLAYER, 0xFD, 0x01 .charmapconst PLAYER, 0xFD, 0x01
.charmapconst STRVAR_1, 0xFD, 0x02 .charmapconst STRVAR_1, 0xFD, 0x02
.charmapconst STRVAR_2, 0xFD, 0x03 .charmapconst STRVAR_2, 0xFD, 0x03
.charmapconst STRVAR_3, 0xFD, 0x04 .charmapconst STRVAR_3, 0xFD, 0x04
; unknown (0xFD, 0x05) @ unknown (0xFD, 0x05)
.charmapconst RIVAL, 0xFD, 0x06 .charmapconst RIVAL, 0xFD, 0x06
; version-dependent strings (originally made for Ruby/Sapphire differences) @ version-dependent strings (originally made for Ruby/Sapphire differences)
.charmapconst VERSION, 0xFD, 0x07 ; "EMERALD" .charmapconst VERSION, 0xFD, 0x07 @ "EMERALD"
.charmapconst AQUA, 0xFD, 0x08 .charmapconst AQUA, 0xFD, 0x08
.charmapconst MAGMA, 0xFD, 0x09 .charmapconst MAGMA, 0xFD, 0x09
.charmapconst ARCHIE, 0xFD, 0x0A .charmapconst ARCHIE, 0xFD, 0x0A
asm/crt0.s
+7 -7
View File
@@ -1,24 +1,24 @@
RomBase: ; 8000000 RomBase: @ 8000000
b Init b Init
.include "asm/rom_header.s" .include "asm/rom_header.s"
; 80000C0 @ 80000C0
.4byte 0 .4byte 0
GPIOPortData: ; 80000C4 GPIOPortData: @ 80000C4
.2byte 0 .2byte 0
GPIOPortDirection: ; 80000C6 GPIOPortDirection: @ 80000C6
.2byte 0 .2byte 0
GPIOPortReadWrite: ; 80000C8 GPIOPortReadWrite: @ 80000C8
.2byte 0 .2byte 0
.incbin "base_emerald.gba", 0xCA, 0x204 - 0xCA .incbin "base_emerald.gba", 0xCA, 0x204 - 0xCA
arm_func_start Init arm_func_start Init
Init: ; 8000204 Init: @ 8000204
mov r0, PSR_IRQ_MODE mov r0, PSR_IRQ_MODE
msr cpsr_cf, r0 msr cpsr_cf, r0
ldr sp, sp_irq ldr sp, sp_irq
@@ -42,7 +42,7 @@ sp_irq: .4byte IWRAM_END - 0x60
arm_func_end Init arm_func_end Init
arm_func_start InterruptMain arm_func_start InterruptMain
InterruptMain: ; 8000248 InterruptMain: @ 8000248
mov r3, REG_BASE mov r3, REG_BASE
add r3, r3, 0x200 add r3, r3, 0x200
ldr r2, [r3, OFFSET_REG_IE - 0x200] ldr r2, [r3, OFFSET_REG_IE - 0x200]
asm/dma3_manager.s
+10 -10
View File
@@ -1,6 +1,6 @@
thumb_func_start ClearDma3Requests thumb_func_start ClearDma3Requests
; void ClearDma3Requests() @ void ClearDma3Requests()
ClearDma3Requests: ; 8000BB8 ClearDma3Requests: @ 8000BB8
push {lr} push {lr}
ldr r2, =gDma3ManagerLocked ldr r2, =gDma3ManagerLocked
movs r0, 0x1 movs r0, 0x1
@@ -27,8 +27,8 @@ _8000BCC:
thumb_func_end ClearDma3Requests thumb_func_end ClearDma3Requests
thumb_func_start ProcessDma3Requests thumb_func_start ProcessDma3Requests
; void ProcessDma3Requests() @ void ProcessDma3Requests()
ProcessDma3Requests: ; 8000BF0 ProcessDma3Requests: @ 8000BF0
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -340,8 +340,8 @@ _08000E46:
thumb_func_end ProcessDma3Requests thumb_func_end ProcessDma3Requests
thumb_func_start RequestDma3Copy thumb_func_start RequestDma3Copy
; int RequestDma3Copy(void *src, void *dest, u16 size, u8 mode) @ int RequestDma3Copy(void *src, void *dest, u16 size, u8 mode)
RequestDma3Copy: ; 8000E68 RequestDma3Copy: @ 8000E68
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -420,8 +420,8 @@ _08000EF0:
thumb_func_end RequestDma3Copy thumb_func_end RequestDma3Copy
thumb_func_start RequestDma3Fill thumb_func_start RequestDma3Fill
; int RequestDma3Fill(s32 value, void *dest, u16 size, u8 mode) @ int RequestDma3Fill(s32 value, void *dest, u16 size, u8 mode)
RequestDma3Fill: ; 8000F00 RequestDma3Fill: @ 8000F00
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -506,8 +506,8 @@ _08000F96:
thumb_func_end RequestDma3Fill thumb_func_end RequestDma3Fill
thumb_func_start CheckForSpaceForDma3Request thumb_func_start CheckForSpaceForDma3Request
; int CheckForSpaceForDma3Request(s16 index) @ int CheckForSpaceForDma3Request(s16 index)
CheckForSpaceForDma3Request: ; 8000FA4 CheckForSpaceForDma3Request: @ 8000FA4
push {lr} push {lr}
movs r2, 0 movs r2, 0
lsls r0, 16 lsls r0, 16
asm/emerald.s
+15826 -15826
View File
File diff suppressed because it is too large Load Diff
asm/gpu_bg.s
+104 -104
View File
@@ -1,6 +1,6 @@
thumb_func_start ResetBgs thumb_func_start ResetBgs
; void ResetBgs() @ void ResetBgs()
ResetBgs: ; 80012F0 ResetBgs: @ 80012F0
push {lr} push {lr}
bl ResetBgControlStructs bl ResetBgControlStructs
ldr r1, =0x030008e0 ldr r1, =0x030008e0
@@ -13,8 +13,8 @@ ResetBgs: ; 80012F0
thumb_func_end ResetBgs thumb_func_end ResetBgs
thumb_func_start SetBgModeInternal thumb_func_start SetBgModeInternal
; void SetBgModeInternal(u8 bgMode) @ void SetBgModeInternal(u8 bgMode)
SetBgModeInternal: ; 8001308 SetBgModeInternal: @ 8001308
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r3, =0x030008e0 ldr r3, =0x030008e0
@@ -28,8 +28,8 @@ SetBgModeInternal: ; 8001308
thumb_func_end SetBgModeInternal thumb_func_end SetBgModeInternal
thumb_func_start GetBgMode thumb_func_start GetBgMode
; u8 GetBgMode() @ u8 GetBgMode()
GetBgMode: ; 8001324 GetBgMode: @ 8001324
ldr r0, =0x030008e0 ldr r0, =0x030008e0
ldrb r1, [r0, 0x10] ldrb r1, [r0, 0x10]
movs r0, 0x7 movs r0, 0x7
@@ -39,8 +39,8 @@ GetBgMode: ; 8001324
thumb_func_end GetBgMode thumb_func_end GetBgMode
thumb_func_start ResetBgControlStructs thumb_func_start ResetBgControlStructs
; void ResetBgControlStructs() @ void ResetBgControlStructs()
ResetBgControlStructs: ; 8001334 ResetBgControlStructs: @ 8001334
push {lr} push {lr}
ldr r2, =0x030008e0 ldr r2, =0x030008e0
ldr r0, =gZeroedBgControlStruct ldr r0, =gZeroedBgControlStruct
@@ -58,8 +58,8 @@ _08001340:
thumb_func_end ResetBgControlStructs thumb_func_end ResetBgControlStructs
thumb_func_start Unused_ResetBgControlStruct thumb_func_start Unused_ResetBgControlStruct
; void Unused_ResetBgControlStruct(u8 bg) @ void Unused_ResetBgControlStruct(u8 bg)
Unused_ResetBgControlStruct: ; 8001354 Unused_ResetBgControlStruct: @ 8001354
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -82,8 +82,8 @@ _08001372:
thumb_func_end Unused_ResetBgControlStruct thumb_func_end Unused_ResetBgControlStruct
thumb_func_start SetBgControlAttributes thumb_func_start SetBgControlAttributes
; void SetBgControlAttributes(u8 bg, u8 tilesBaseBlock, u8 tileMapBaseBlock, u8 screenSize, u8 paletteMode, u8 priority, u8 mosaic, u8 wraparound) @ void SetBgControlAttributes(u8 bg, u8 tilesBaseBlock, u8 tileMapBaseBlock, u8 screenSize, u8 paletteMode, u8 priority, u8 mosaic, u8 wraparound)
SetBgControlAttributes: ; 8001380 SetBgControlAttributes: @ 8001380
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -243,8 +243,8 @@ _08001498:
thumb_func_end SetBgControlAttributes thumb_func_end SetBgControlAttributes
thumb_func_start GetBgControlAttribute thumb_func_start GetBgControlAttribute
; u8 GetBgControlAttribute(u8 bg, u8 attributeId) @ u8 GetBgControlAttribute(u8 bg, u8 attributeId)
GetBgControlAttribute: ; 80014AC GetBgControlAttribute: @ 80014AC
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -337,8 +337,8 @@ _0800155A:
thumb_func_end GetBgControlAttribute thumb_func_end GetBgControlAttribute
thumb_func_start LoadBgVram thumb_func_start LoadBgVram
; u8 LoadBgVram(u8, void *src, u16 size, u16 destOffset, u8 mode) @ u8 LoadBgVram(u8, void *src, u16 size, u16 destOffset, u8 mode)
LoadBgVram: ; 8001560 LoadBgVram: @ 8001560
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -413,8 +413,8 @@ _080015DE:
thumb_func_end LoadBgVram thumb_func_end LoadBgVram
thumb_func_start ShowBgInternal thumb_func_start ShowBgInternal
; void ShowBgInternal(u8 bg) @ void ShowBgInternal(u8 bg)
ShowBgInternal: ; 80015E8 ShowBgInternal: @ 80015E8
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -476,8 +476,8 @@ _08001656:
thumb_func_end ShowBgInternal thumb_func_end ShowBgInternal
thumb_func_start HideBgInternal thumb_func_start HideBgInternal
; void HideBgInternal(u8 bg) @ void HideBgInternal(u8 bg)
HideBgInternal: ; 8001664 HideBgInternal: @ 8001664
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -504,8 +504,8 @@ _0800168A:
thumb_func_end HideBgInternal thumb_func_end HideBgInternal
thumb_func_start SyncBgVisibilityAndMode thumb_func_start SyncBgVisibilityAndMode
; void SyncBgVisibilityAndMode() @ void SyncBgVisibilityAndMode()
SyncBgVisibilityAndMode: ; 8001698 SyncBgVisibilityAndMode: @ 8001698
push {lr} push {lr}
movs r0, 0 movs r0, 0
bl GetGpuReg bl GetGpuReg
@@ -522,8 +522,8 @@ SyncBgVisibilityAndMode: ; 8001698
thumb_func_end SyncBgVisibilityAndMode thumb_func_end SyncBgVisibilityAndMode
thumb_func_start SetTextModeAndHideBgs thumb_func_start SetTextModeAndHideBgs
; void SetTextModeAndHideBgs() @ void SetTextModeAndHideBgs()
SetTextModeAndHideBgs: ; 80016BC SetTextModeAndHideBgs: @ 80016BC
push {lr} push {lr}
movs r0, 0 movs r0, 0
bl GetGpuReg bl GetGpuReg
@@ -537,8 +537,8 @@ SetTextModeAndHideBgs: ; 80016BC
thumb_func_end SetTextModeAndHideBgs thumb_func_end SetTextModeAndHideBgs
thumb_func_start SetBgAffineInternal thumb_func_start SetBgAffineInternal
; void SetBgAffineInternal(u8 bg, u16 srcCenterX, u16 srcCenterY, u16 dispCenterX, u16 dispCenterY, u16 scaleX, u16 scaleY, u16 rotationAngle) @ void SetBgAffineInternal(u8 bg, u16 srcCenterX, u16 srcCenterY, u16 dispCenterX, u16 dispCenterY, u16 scaleX, u16 scaleY, u16 rotationAngle)
SetBgAffineInternal: ; 80016D8 SetBgAffineInternal: @ 80016D8
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -635,8 +635,8 @@ _08001796:
thumb_func_end SetBgAffineInternal thumb_func_end SetBgAffineInternal
thumb_func_start IsInvalidBg thumb_func_start IsInvalidBg
; bool8 IsInvalidBg(u8 bg) @ bool8 IsInvalidBg(u8 bg)
IsInvalidBg: ; 80017A4 IsInvalidBg: @ 80017A4
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -652,15 +652,15 @@ _080017B4:
thumb_func_end IsInvalidBg thumb_func_end IsInvalidBg
thumb_func_start DummiedOutFireRedLeafGreenTileAllocFunc thumb_func_start DummiedOutFireRedLeafGreenTileAllocFunc
; int DummiedOutFireRedLeafGreenTileAllocFunc() @ int DummiedOutFireRedLeafGreenTileAllocFunc()
DummiedOutFireRedLeafGreenTileAllocFunc: ; 80017B8 DummiedOutFireRedLeafGreenTileAllocFunc: @ 80017B8
movs r0, 0 movs r0, 0
bx lr bx lr
thumb_func_end DummiedOutFireRedLeafGreenTileAllocFunc thumb_func_end DummiedOutFireRedLeafGreenTileAllocFunc
thumb_func_start ResetBgsAndClearDma3BusyFlags thumb_func_start ResetBgsAndClearDma3BusyFlags
; void ResetBgsAndClearDma3BusyFlags(u32 leftoverFireRedLeafGreenVariable) @ void ResetBgsAndClearDma3BusyFlags(u32 leftoverFireRedLeafGreenVariable)
ResetBgsAndClearDma3BusyFlags: ; 80017BC ResetBgsAndClearDma3BusyFlags: @ 80017BC
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl ResetBgs bl ResetBgs
@@ -682,8 +682,8 @@ _080017CC:
thumb_func_end ResetBgsAndClearDma3BusyFlags thumb_func_end ResetBgsAndClearDma3BusyFlags
thumb_func_start InitBgsFromTemplates thumb_func_start InitBgsFromTemplates
; void InitBgsFromTemplates(u8 bgMode, struct BgTemplate *templates, u8 numTemplates) @ void InitBgsFromTemplates(u8 bgMode, struct BgTemplate *templates, u8 numTemplates)
InitBgsFromTemplates: ; 80017E8 InitBgsFromTemplates: @ 80017E8
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -782,8 +782,8 @@ _08001894:
thumb_func_end InitBgsFromTemplates thumb_func_end InitBgsFromTemplates
thumb_func_start InitBgFromTemplate thumb_func_start InitBgFromTemplate
; void InitBgFromTemplate(struct BgTemplate *templates) @ void InitBgFromTemplate(struct BgTemplate *templates)
InitBgFromTemplate: ; 80018B0 InitBgFromTemplate: @ 80018B0
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x10 sub sp, 0x10
adds r7, r0, 0 adds r7, r0, 0
@@ -848,8 +848,8 @@ _08001920:
thumb_func_end InitBgFromTemplate thumb_func_end InitBgFromTemplate
thumb_func_start SetBgMode thumb_func_start SetBgMode
; void SetBgMode(u8 bgMode) @ void SetBgMode(u8 bgMode)
SetBgMode: ; 8001934 SetBgMode: @ 8001934
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -859,8 +859,8 @@ SetBgMode: ; 8001934
thumb_func_end SetBgMode thumb_func_end SetBgMode
thumb_func_start LoadBgTiles thumb_func_start LoadBgTiles
; u8 LoadBgTiles(u8 bg, void *src, u16 size, u16 destOffset) @ u8 LoadBgTiles(u8 bg, void *src, u16 size, u16 destOffset)
LoadBgTiles: ; 8001944 LoadBgTiles: @ 8001944
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -950,8 +950,8 @@ _080019E6:
thumb_func_end LoadBgTiles thumb_func_end LoadBgTiles
thumb_func_start LoadBgTilemap thumb_func_start LoadBgTilemap
; u8 LoadBgTilemap(u8 bg, void *src, u16 size, u16 destOffset) @ u8 LoadBgTilemap(u8 bg, void *src, u16 size, u16 destOffset)
LoadBgTilemap: ; 80019FC LoadBgTilemap: @ 80019FC
push {r4,lr} push {r4,lr}
sub sp, 0x4 sub sp, 0x4
lsls r0, 24 lsls r0, 24
@@ -992,8 +992,8 @@ _08001A3E:
thumb_func_end LoadBgTilemap thumb_func_end LoadBgTilemap
thumb_func_start Unused_LoadBgPalette thumb_func_start Unused_LoadBgPalette
; u8 Unused_LoadBgPalette(u8 bg, void *src, u16 size, u16 destOffset) @ u8 Unused_LoadBgPalette(u8 bg, void *src, u16 size, u16 destOffset)
Unused_LoadBgPalette: ; 8001A4C Unused_LoadBgPalette: @ 8001A4C
push {r4-r7,lr} push {r4-r7,lr}
adds r7, r1, 0 adds r7, r1, 0
lsls r0, 24 lsls r0, 24
@@ -1062,8 +1062,8 @@ _08001AC8:
thumb_func_end Unused_LoadBgPalette thumb_func_end Unused_LoadBgPalette
thumb_func_start IsDma3ManagerBusyWithBgCopy thumb_func_start IsDma3ManagerBusyWithBgCopy
; bool8 IsDma3ManagerBusyWithBgCopy() @ bool8 IsDma3ManagerBusyWithBgCopy()
IsDma3ManagerBusyWithBgCopy: ; 8001AD4 IsDma3ManagerBusyWithBgCopy: @ 8001AD4
push {r4-r7,lr} push {r4-r7,lr}
movs r5, 0 movs r5, 0
movs r7, 0x1 movs r7, 0x1
@@ -1115,8 +1115,8 @@ _08001B2A:
thumb_func_end IsDma3ManagerBusyWithBgCopy thumb_func_end IsDma3ManagerBusyWithBgCopy
thumb_func_start ShowBg thumb_func_start ShowBg
; void ShowBg(u8 bg) @ void ShowBg(u8 bg)
ShowBg: ; 8001B30 ShowBg: @ 8001B30
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -1127,8 +1127,8 @@ ShowBg: ; 8001B30
thumb_func_end ShowBg thumb_func_end ShowBg
thumb_func_start HideBg thumb_func_start HideBg
; void HideBg(u8 bg) @ void HideBg(u8 bg)
HideBg: ; 8001B44 HideBg: @ 8001B44
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -1139,8 +1139,8 @@ HideBg: ; 8001B44
thumb_func_end HideBg thumb_func_end HideBg
thumb_func_start SetBgAttribute thumb_func_start SetBgAttribute
; void SetBgAttribute(u8 bg, u8 attributeId, u8 value) @ void SetBgAttribute(u8 bg, u8 attributeId, u8 value)
SetBgAttribute: ; 8001B58 SetBgAttribute: @ 8001B58
push {r4,lr} push {r4,lr}
sub sp, 0x10 sub sp, 0x10
lsls r0, 24 lsls r0, 24
@@ -1243,8 +1243,8 @@ _08001C12:
thumb_func_end SetBgAttribute thumb_func_end SetBgAttribute
thumb_func_start GetBgAttribute thumb_func_start GetBgAttribute
; u8 GetBgAttribute(u8 bg, u8 attributeId) @ u8 GetBgAttribute(u8 bg, u8 attributeId)
GetBgAttribute: ; 8001C1C GetBgAttribute: @ 8001C1C
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -1355,8 +1355,8 @@ _08001CFA:
thumb_func_end GetBgAttribute thumb_func_end GetBgAttribute
thumb_func_start ChangeBgX thumb_func_start ChangeBgX
; u32 ChangeBgX(u8 bg, u32 value, u8 op) @ u32 ChangeBgX(u8 bg, u32 value, u8 op)
ChangeBgX: ; 8001D04 ChangeBgX: @ 8001D04
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r1, 0 adds r6, r1, 0
lsls r0, 24 lsls r0, 24
@@ -1509,8 +1509,8 @@ _08001E34:
thumb_func_end ChangeBgX thumb_func_end ChangeBgX
thumb_func_start GetBgX thumb_func_start GetBgX
; u32 GetBgX(u8 bg) @ u32 GetBgX(u8 bg)
GetBgX: ; 8001E40 GetBgX: @ 8001E40
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -1541,8 +1541,8 @@ _08001E74:
thumb_func_end GetBgX thumb_func_end GetBgX
thumb_func_start ChangeBgY thumb_func_start ChangeBgY
; u32 ChangeBgY(u8 bg, u32 value, u8 op) @ u32 ChangeBgY(u8 bg, u32 value, u8 op)
ChangeBgY: ; 8001E7C ChangeBgY: @ 8001E7C
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r1, 0 adds r6, r1, 0
lsls r0, 24 lsls r0, 24
@@ -1695,8 +1695,8 @@ _08001FAC:
thumb_func_end ChangeBgY thumb_func_end ChangeBgY
thumb_func_start ChangeBgY_ScreenOff thumb_func_start ChangeBgY_ScreenOff
; u32 ChangeBgY_ScreenOff(u8 bg, u32 value, u8 op) @ u32 ChangeBgY_ScreenOff(u8 bg, u32 value, u8 op)
ChangeBgY_ScreenOff: ; 8001FB8 ChangeBgY_ScreenOff: @ 8001FB8
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r1, 0 adds r6, r1, 0
lsls r0, 24 lsls r0, 24
@@ -1849,8 +1849,8 @@ _080020E8:
thumb_func_end ChangeBgY_ScreenOff thumb_func_end ChangeBgY_ScreenOff
thumb_func_start GetBgY thumb_func_start GetBgY
; u32 GetBgY(u8 bg) @ u32 GetBgY(u8 bg)
GetBgY: ; 80020F4 GetBgY: @ 80020F4
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -1881,8 +1881,8 @@ _08002128:
thumb_func_end GetBgY thumb_func_end GetBgY
thumb_func_start SetBgAffine thumb_func_start SetBgAffine
; void SetBgAffine(u8 bg, u16 srcCenterX, u16 srcCenterY, s16 dispCenterX, s16 dispCenterY, s16 scaleX, s16 scaleY, u16 rotationAngle) @ void SetBgAffine(u8 bg, u16 srcCenterX, u16 srcCenterY, s16 dispCenterX, s16 dispCenterY, s16 scaleX, s16 scaleY, u16 rotationAngle)
SetBgAffine: ; 8002130 SetBgAffine: @ 8002130
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -1917,8 +1917,8 @@ SetBgAffine: ; 8002130
thumb_func_end SetBgAffine thumb_func_end SetBgAffine
thumb_func_start Unused_AdjustBgMosaic thumb_func_start Unused_AdjustBgMosaic
; u8 Unused_AdjustBgMosaic(u8 a1, u8 a2) @ u8 Unused_AdjustBgMosaic(u8 a1, u8 a2)
Unused_AdjustBgMosaic: ; 8002170 Unused_AdjustBgMosaic: @ 8002170
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -2039,8 +2039,8 @@ _08002226:
thumb_func_end Unused_AdjustBgMosaic thumb_func_end Unused_AdjustBgMosaic
thumb_func_start SetBgTilemapBuffer thumb_func_start SetBgTilemapBuffer
; void SetBgTilemapBuffer(u8 bg, void *tilemap) @ void SetBgTilemapBuffer(u8 bg, void *tilemap)
SetBgTilemapBuffer: ; 8002250 SetBgTilemapBuffer: @ 8002250
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r1, 0 adds r5, r1, 0
lsls r0, 24 lsls r0, 24
@@ -2068,8 +2068,8 @@ _0800227A:
thumb_func_end SetBgTilemapBuffer thumb_func_end SetBgTilemapBuffer
thumb_func_start UnsetBgTilemapBuffer thumb_func_start UnsetBgTilemapBuffer
; void UnsetBgTilemapBuffer(u8 bg) @ void UnsetBgTilemapBuffer(u8 bg)
UnsetBgTilemapBuffer: ; 8002284 UnsetBgTilemapBuffer: @ 8002284
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -2097,8 +2097,8 @@ _080022AE:
thumb_func_end UnsetBgTilemapBuffer thumb_func_end UnsetBgTilemapBuffer
thumb_func_start GetBgTilemapBuffer thumb_func_start GetBgTilemapBuffer
; void *GetBgTilemapBuffer(u8 bg) @ void *GetBgTilemapBuffer(u8 bg)
GetBgTilemapBuffer: ; 80022B8 GetBgTilemapBuffer: @ 80022B8
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -2128,8 +2128,8 @@ _080022EA:
thumb_func_end GetBgTilemapBuffer thumb_func_end GetBgTilemapBuffer
thumb_func_start CopyToBgTilemapBuffer thumb_func_start CopyToBgTilemapBuffer
; void CopyToBgTilemapBuffer(u8 bg, void *src, u16 mode, u16 destOffset) @ void CopyToBgTilemapBuffer(u8 bg, void *src, u16 mode, u16 destOffset)
CopyToBgTilemapBuffer: ; 80022F0 CopyToBgTilemapBuffer: @ 80022F0
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -2190,8 +2190,8 @@ _08002358:
thumb_func_end CopyToBgTilemapBuffer thumb_func_end CopyToBgTilemapBuffer
thumb_func_start CopyBgTilemapBufferToVram thumb_func_start CopyBgTilemapBufferToVram
; void CopyBgTilemapBufferToVram(u8 bg) @ void CopyBgTilemapBufferToVram(u8 bg)
CopyBgTilemapBufferToVram: ; 800236C CopyBgTilemapBufferToVram: @ 800236C
push {r4,lr} push {r4,lr}
sub sp, 0x4 sub sp, 0x4
lsls r0, 24 lsls r0, 24
@@ -2245,8 +2245,8 @@ _080023C8:
thumb_func_end CopyBgTilemapBufferToVram thumb_func_end CopyBgTilemapBufferToVram
thumb_func_start CopyToBgTilemapBufferRect thumb_func_start CopyToBgTilemapBufferRect
; void CopyToBgTilemapBufferRect(u8 bg, void *src, u8 destX, u8 destY, u8 width, u8 height) @ void CopyToBgTilemapBufferRect(u8 bg, void *src, u8 destX, u8 destY, u8 width, u8 height)
CopyToBgTilemapBufferRect: ; 80023D4 CopyToBgTilemapBufferRect: @ 80023D4
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -2382,8 +2382,8 @@ _080024C4:
thumb_func_end CopyToBgTilemapBufferRect thumb_func_end CopyToBgTilemapBufferRect
thumb_func_start CopyToBgTilemapBufferRect_ChangePalette thumb_func_start CopyToBgTilemapBufferRect_ChangePalette
; void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette) @ void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette)
CopyToBgTilemapBufferRect_ChangePalette: ; 80024D8 CopyToBgTilemapBufferRect_ChangePalette: @ 80024D8
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x24 sub sp, 0x24
ldr r4, [sp, 0x34] ldr r4, [sp, 0x34]
@@ -2420,8 +2420,8 @@ CopyToBgTilemapBufferRect_ChangePalette: ; 80024D8
thumb_func_end CopyToBgTilemapBufferRect_ChangePalette thumb_func_end CopyToBgTilemapBufferRect_ChangePalette
thumb_func_start CopyRectToBgTilemapBufferRect thumb_func_start CopyRectToBgTilemapBufferRect
; void CopyRectToBgTilemapBufferRect(u8 bg, void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2) @ void CopyRectToBgTilemapBufferRect(u8 bg, void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2)
CopyRectToBgTilemapBufferRect: ; 800251C CopyRectToBgTilemapBufferRect: @ 800251C
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -2668,8 +2668,8 @@ _080026EE:
thumb_func_end CopyRectToBgTilemapBufferRect thumb_func_end CopyRectToBgTilemapBufferRect
thumb_func_start FillBgTilemapBufferRect_Palette0 thumb_func_start FillBgTilemapBufferRect_Palette0
; void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height) @ void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height)
FillBgTilemapBufferRect_Palette0: ; 8002704 FillBgTilemapBufferRect_Palette0: @ 8002704
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -2803,8 +2803,8 @@ _080027F0:
thumb_func_end FillBgTilemapBufferRect_Palette0 thumb_func_end FillBgTilemapBufferRect_Palette0
thumb_func_start FillBgTilemapBufferRect thumb_func_start FillBgTilemapBufferRect
; void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette) @ void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette)
FillBgTilemapBufferRect: ; 8002804 FillBgTilemapBufferRect: @ 8002804
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x10 sub sp, 0x10
ldr r4, [sp, 0x20] ldr r4, [sp, 0x20]
@@ -2837,8 +2837,8 @@ FillBgTilemapBufferRect: ; 8002804
thumb_func_end FillBgTilemapBufferRect thumb_func_end FillBgTilemapBufferRect
thumb_func_start WriteSequenceToBgTilemapBuffer thumb_func_start WriteSequenceToBgTilemapBuffer
; void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 width, u8 height, u8 paletteSlot, u16 tileNumDelta) @ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 width, u8 height, u8 paletteSlot, u16 tileNumDelta)
WriteSequenceToBgTilemapBuffer: ; 8002840 WriteSequenceToBgTilemapBuffer: @ 8002840
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -3051,8 +3051,8 @@ _080029D4:
thumb_func_end WriteSequenceToBgTilemapBuffer thumb_func_end WriteSequenceToBgTilemapBuffer
thumb_func_start GetBgMetricTextMode thumb_func_start GetBgMetricTextMode
; u16 GetBgMetricTextMode(u8 bg, u8 whichMetric) @ u16 GetBgMetricTextMode(u8 bg, u8 whichMetric)
GetBgMetricTextMode: ; 80029EC GetBgMetricTextMode: @ 80029EC
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -3121,8 +3121,8 @@ _08002A54:
thumb_func_end GetBgMetricTextMode thumb_func_end GetBgMetricTextMode
thumb_func_start GetBgMetricAffineMode thumb_func_start GetBgMetricAffineMode
; u16 GetBgMetricAffineMode(u8 bg, u8 whichMetric) @ u16 GetBgMetricAffineMode(u8 bg, u8 whichMetric)
GetBgMetricAffineMode: ; 8002A5C GetBgMetricAffineMode: @ 8002A5C
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -3177,8 +3177,8 @@ _08002AAE:
thumb_func_end GetBgMetricAffineMode thumb_func_end GetBgMetricAffineMode
thumb_func_start GetTileMapIndexFromCoords thumb_func_start GetTileMapIndexFromCoords
; u32 GetTileMapIndexFromCoords(u32 x, u32 y, u32 screenSize, u32 screenWidth, u32 screenHeight) @ u32 GetTileMapIndexFromCoords(u32 x, u32 y, u32 screenSize, u32 screenWidth, u32 screenHeight)
GetTileMapIndexFromCoords: ; 8002AB4 GetTileMapIndexFromCoords: @ 8002AB4
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
ldr r0, [sp, 0x8] ldr r0, [sp, 0x8]
@@ -3211,8 +3211,8 @@ _08002AE0:
thumb_func_end GetTileMapIndexFromCoords thumb_func_end GetTileMapIndexFromCoords
thumb_func_start CopyTileMapEntry thumb_func_start CopyTileMapEntry
; void CopyTileMapEntry(u16 *src, u16 *dest, s32 palette1, u16 tileOffset, u32 palette2) @ void CopyTileMapEntry(u16 *src, u16 *dest, s32 palette1, u16 tileOffset, u32 palette2)
CopyTileMapEntry: ; 8002AEC CopyTileMapEntry: @ 8002AEC
push {r4-r6,lr} push {r4-r6,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r6, r1, 0 adds r6, r1, 0
@@ -3263,8 +3263,8 @@ _08002B3C:
thumb_func_end CopyTileMapEntry thumb_func_end CopyTileMapEntry
thumb_func_start GetBgType thumb_func_start GetBgType
; u16 GetBgType(u8 bg) @ u16 GetBgType(u8 bg)
GetBgType: ; 8002B48 GetBgType: @ 8002B48
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -3314,8 +3314,8 @@ _08002B90:
thumb_func_end GetBgType thumb_func_end GetBgType
thumb_func_start IsInvalidBg_ thumb_func_start IsInvalidBg_
; bool8 IsInvalidBg_(u8 bg) @ bool8 IsInvalidBg_(u8 bg)
IsInvalidBg_: ; 8002B9C IsInvalidBg_: @ 8002B9C
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -3331,8 +3331,8 @@ _08002BAC:
thumb_func_end IsInvalidBg_ thumb_func_end IsInvalidBg_
thumb_func_start IsTileMapOutsideWram thumb_func_start IsTileMapOutsideWram
; bool8 IsTileMapOutsideWram(u8 bg) @ bool8 IsTileMapOutsideWram(u8 bg)
IsTileMapOutsideWram: ; 8002BB0 IsTileMapOutsideWram: @ 8002BB0
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
ldr r1, =0x030008f8 ldr r1, =0x030008f8
asm/gpu_obj.s
+198 -198
View File
File diff suppressed because it is too large Load Diff
asm/libagbbackup.s
+28 -28
View File
@@ -1,5 +1,5 @@
thumb_func_start SwitchFlashBank thumb_func_start SwitchFlashBank
SwitchFlashBank: ; 82E185C SwitchFlashBank: @ 82E185C
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r3, =0x0e005555 ldr r3, =0x0e005555
@@ -18,8 +18,8 @@ SwitchFlashBank: ; 82E185C
thumb_func_end SwitchFlashBank thumb_func_end SwitchFlashBank
thumb_func_start ReadFlashID thumb_func_start ReadFlashID
; u16 ReadFlashID() @ u16 ReadFlashID()
ReadFlashID: ; 82E1880 ReadFlashID: @ 82E1880
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x44 sub sp, 0x44
mov r0, sp mov r0, sp
@@ -87,8 +87,8 @@ _082E1908:
thumb_func_end ReadFlashID thumb_func_end ReadFlashID
thumb_func_start FlashTimerIntr thumb_func_start FlashTimerIntr
; void FlashTimerIntr() @ void FlashTimerIntr()
FlashTimerIntr: ; 82E191C FlashTimerIntr: @ 82E191C
push {lr} push {lr}
ldr r1, =0x03001a72 ldr r1, =0x03001a72
ldrh r0, [r1] ldrh r0, [r1]
@@ -110,8 +110,8 @@ _082E1938:
thumb_func_end FlashTimerIntr thumb_func_end FlashTimerIntr
thumb_func_start SetFlashTimerIntr thumb_func_start SetFlashTimerIntr
; void SetFlashTimerIntr(u8 timer_id, void ( **irq_timer_func)()) @ void SetFlashTimerIntr(u8 timer_id, void ( **irq_timer_func)())
SetFlashTimerIntr: ; 82E1944 SetFlashTimerIntr: @ 82E1944
push {lr} push {lr}
adds r2, r1, 0 adds r2, r1, 0
lsls r0, 24 lsls r0, 24
@@ -139,7 +139,7 @@ _082E197A:
thumb_func_end SetFlashTimerIntr thumb_func_end SetFlashTimerIntr
thumb_func_start StartFlashTimer thumb_func_start StartFlashTimer
StartFlashTimer: ; 82E1980 StartFlashTimer: @ 82E1980
push {r4-r6,lr} push {r4-r6,lr}
mov r6, r10 mov r6, r10
mov r5, r9 mov r5, r9
@@ -209,7 +209,7 @@ StartFlashTimer: ; 82E1980
thumb_func_end StartFlashTimer thumb_func_end StartFlashTimer
thumb_func_start StopFlashTimer thumb_func_start StopFlashTimer
StopFlashTimer: ; 82E1A28 StopFlashTimer: @ 82E1A28
ldr r3, =0x04000208 ldr r3, =0x04000208
movs r1, 0 movs r1, 0
strh r1, [r3] strh r1, [r3]
@@ -237,15 +237,15 @@ StopFlashTimer: ; 82E1A28
thumb_func_end StopFlashTimer thumb_func_end StopFlashTimer
thumb_func_start ReadFlash1 thumb_func_start ReadFlash1
; u8 ReadFlash1(int address) @ u8 ReadFlash1(int address)
ReadFlash1: ; 82E1A6C ReadFlash1: @ 82E1A6C
ldrb r0, [r0] ldrb r0, [r0]
bx lr bx lr
thumb_func_end ReadFlash1 thumb_func_end ReadFlash1
thumb_func_start SetReadFlash1 thumb_func_start SetReadFlash1
; void SetReadFlash1(u8 ( *target_func)(int address)) @ void SetReadFlash1(u8 ( *target_func)(int address))
SetReadFlash1: ; 82E1A70 SetReadFlash1: @ 82E1A70
push {lr} push {lr}
adds r2, r0, 0 adds r2, r0, 0
ldr r1, =0x03007844 ldr r1, =0x03007844
@@ -276,7 +276,7 @@ _082E1AA4:
thumb_func_end SetReadFlash1 thumb_func_end SetReadFlash1
thumb_func_start ReadFlash_Core thumb_func_start ReadFlash_Core
ReadFlash_Core: ; 82E1AB0 ReadFlash_Core: @ 82E1AB0
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
subs r3, r2, 0x1 subs r3, r2, 0x1
@@ -299,7 +299,7 @@ _082E1ACC:
thumb_func_end ReadFlash_Core thumb_func_end ReadFlash_Core
thumb_func_start ReadFlash thumb_func_start ReadFlash
ReadFlash: ; 82E1AD4 ReadFlash: @ 82E1AD4
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x80 sub sp, 0x80
adds r5, r1, 0 adds r5, r1, 0
@@ -371,7 +371,7 @@ _082E1B40:
thumb_func_end ReadFlash thumb_func_end ReadFlash
thumb_func_start VerifyFlashSector_Core thumb_func_start VerifyFlashSector_Core
VerifyFlashSector_Core: ; 82E1B70 VerifyFlashSector_Core: @ 82E1B70
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r0, 0 adds r5, r0, 0
adds r3, r1, 0 adds r3, r1, 0
@@ -402,7 +402,7 @@ _082E1B98:
thumb_func_end VerifyFlashSector_Core thumb_func_end VerifyFlashSector_Core
thumb_func_start VerifyFlashSector thumb_func_start VerifyFlashSector
VerifyFlashSector: ; 82E1BA0 VerifyFlashSector: @ 82E1BA0
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x100 sub sp, 0x100
adds r5, r1, 0 adds r5, r1, 0
@@ -471,7 +471,7 @@ _082E1C08:
thumb_func_end VerifyFlashSector thumb_func_end VerifyFlashSector
thumb_func_start VerifyFlashSectorFirstNBytes thumb_func_start VerifyFlashSectorFirstNBytes
VerifyFlashSectorFirstNBytes: ; 82E1C38 VerifyFlashSectorFirstNBytes: @ 82E1C38
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x100 sub sp, 0x100
adds r5, r1, 0 adds r5, r1, 0
@@ -541,7 +541,7 @@ _082E1CA0:
thumb_func_end VerifyFlashSectorFirstNBytes thumb_func_end VerifyFlashSectorFirstNBytes
thumb_func_start ProgramFlashSectorsAndVerify thumb_func_start ProgramFlashSectorsAndVerify
ProgramFlashSectorsAndVerify: ; 82E1CD0 ProgramFlashSectorsAndVerify: @ 82E1CD0
push {r4-r6,lr} push {r4-r6,lr}
adds r5, r1, 0 adds r5, r1, 0
lsls r0, 16 lsls r0, 16
@@ -579,7 +579,7 @@ _082E1D08:
thumb_func_end ProgramFlashSectorsAndVerify thumb_func_end ProgramFlashSectorsAndVerify
thumb_func_start ProgramFlashSectorsVerifyFirstNBytes thumb_func_start ProgramFlashSectorsVerifyFirstNBytes
ProgramFlashSectorsVerifyFirstNBytes: ; 82E1D14 ProgramFlashSectorsVerifyFirstNBytes: @ 82E1D14
push {r4-r7,lr} push {r4-r7,lr}
adds r5, r1, 0 adds r5, r1, 0
adds r7, r2, 0 adds r7, r2, 0
@@ -619,8 +619,8 @@ _082E1D50:
thumb_func_end ProgramFlashSectorsVerifyFirstNBytes thumb_func_end ProgramFlashSectorsVerifyFirstNBytes
thumb_func_start IdentifyFlash thumb_func_start IdentifyFlash
; _BOOL2 IdentifyFlash() @ _BOOL2 IdentifyFlash()
IdentifyFlash: ; 82E1D5C IdentifyFlash: @ 82E1D5C
push {r4,lr} push {r4,lr}
ldr r2, =0x04000204 ldr r2, =0x04000204
ldrh r0, [r2] ldrh r0, [r2]
@@ -686,7 +686,7 @@ _082E1D9E:
thumb_func_end IdentifyFlash thumb_func_end IdentifyFlash
thumb_func_start PollingSR_COMMON thumb_func_start PollingSR_COMMON
PollingSR_COMMON: ; 82E1DFC PollingSR_COMMON: @ 82E1DFC
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r9 mov r7, r9
mov r6, r8 mov r6, r8
@@ -765,7 +765,7 @@ _082E1E88:
thumb_func_end PollingSR_COMMON thumb_func_end PollingSR_COMMON
thumb_func_start EraseFlashChip thumb_func_start EraseFlashChip
EraseFlashChip: ; 82E1E9C EraseFlashChip: @ 82E1E9C
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x40 sub sp, 0x40
ldr r5, =0x04000204 ldr r5, =0x04000204
@@ -813,7 +813,7 @@ EraseFlashChip: ; 82E1E9C
thumb_func_end EraseFlashChip thumb_func_end EraseFlashChip
thumb_func_start EraseFlashSector thumb_func_start EraseFlashSector
EraseFlashSector: ; 82E1F10 EraseFlashSector: @ 82E1F10
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x40 sub sp, 0x40
lsls r0, 16 lsls r0, 16
@@ -903,7 +903,7 @@ _082E1FD0:
thumb_func_end EraseFlashSector thumb_func_end EraseFlashSector
thumb_func_start ProgramFlashByte thumb_func_start ProgramFlashByte
ProgramFlashByte: ; 82E1FE0 ProgramFlashByte: @ 82E1FE0
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x40 sub sp, 0x40
adds r6, r1, 0 adds r6, r1, 0
@@ -969,7 +969,7 @@ _082E206C:
thumb_func_end ProgramFlashByte thumb_func_end ProgramFlashByte
thumb_func_start ProgramFlashByteInternal thumb_func_start ProgramFlashByteInternal
ProgramFlashByteInternal: ; 82E2074 ProgramFlashByteInternal: @ 82E2074
push {r4,lr} push {r4,lr}
ldr r4, =0x0e005555 ldr r4, =0x0e005555
movs r2, 0xAA movs r2, 0xAA
@@ -995,7 +995,7 @@ ProgramFlashByteInternal: ; 82E2074
thumb_func_end ProgramFlashByteInternal thumb_func_end ProgramFlashByteInternal
thumb_func_start ProgramFlashSector thumb_func_start ProgramFlashSector
ProgramFlashSector: ; 82E20AC ProgramFlashSector: @ 82E20AC
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x40 sub sp, 0x40
adds r7, r1, 0 adds r7, r1, 0
asm/libagbsyscall.s
+25 -25
View File
@@ -1,86 +1,86 @@
thumb_func_start ArcTan2 thumb_func_start ArcTan2
ArcTan2: ; 82E7078 ArcTan2: @ 82E7078
swi 0xA swi 0xA
bx lr bx lr
thumb_func_end ArcTan2 thumb_func_end ArcTan2
thumb_func_start BgAffineSet thumb_func_start BgAffineSet
; void BgAffineSet(BgAffineSet_src_data *src, BgAffineSet_dest_data *dest, int entry_count) @ void BgAffineSet(BgAffineSet_src_data *src, BgAffineSet_dest_data *dest, int entry_count)
BgAffineSet: ; 82E707C BgAffineSet: @ 82E707C
swi 0xE swi 0xE
bx lr bx lr
thumb_func_end BgAffineSet thumb_func_end BgAffineSet
thumb_func_start CpuFastSet thumb_func_start CpuFastSet
; void CpuFastSet(void *src, void *dest, unsigned int mode) @ void CpuFastSet(void *src, void *dest, unsigned int mode)
CpuFastSet: ; 82E7080 CpuFastSet: @ 82E7080
swi 0xC swi 0xC
bx lr bx lr
thumb_func_end CpuFastSet thumb_func_end CpuFastSet
thumb_func_start CpuSet thumb_func_start CpuSet
; void CpuSet(void *src, void *dest, unsigned int mode) @ void CpuSet(void *src, void *dest, unsigned int mode)
CpuSet: ; 82E7084 CpuSet: @ 82E7084
swi 0xB swi 0xB
bx lr bx lr
thumb_func_end CpuSet thumb_func_end CpuSet
thumb_func_start Div thumb_func_start Div
Div: ; 82E7088 Div: @ 82E7088
swi 0x6 swi 0x6
bx lr bx lr
thumb_func_end Div thumb_func_end Div
thumb_func_start LZ77UnCompVram thumb_func_start LZ77UnCompVram
; void LZ77UnCompVram(void *src, void *dest) @ void LZ77UnCompVram(void *src, void *dest)
LZ77UnCompVram: ; 82E708C LZ77UnCompVram: @ 82E708C
swi 0x12 swi 0x12
bx lr bx lr
thumb_func_end LZ77UnCompVram thumb_func_end LZ77UnCompVram
thumb_func_start LZ77UnCompWram thumb_func_start LZ77UnCompWram
; void LZ77UnCompWram(void *src, void *dest) @ void LZ77UnCompWram(void *src, void *dest)
LZ77UnCompWram: ; 82E7090 LZ77UnCompWram: @ 82E7090
swi 0x11 swi 0x11
bx lr bx lr
thumb_func_end LZ77UnCompWram thumb_func_end LZ77UnCompWram
thumb_func_start MultiBoot thumb_func_start MultiBoot
; s32 MultiBoot(struct MultiBootParam *mp) @ s32 MultiBoot(struct MultiBootParam *mp)
MultiBoot: ; 82E7094 MultiBoot: @ 82E7094
movs r1, 0x1 movs r1, 0x1
swi 0x25 swi 0x25
bx lr bx lr
thumb_func_end MultiBoot thumb_func_end MultiBoot
thumb_func_start ObjAffineSet thumb_func_start ObjAffineSet
ObjAffineSet: ; 82E709C ObjAffineSet: @ 82E709C
swi 0xF swi 0xF
bx lr bx lr
thumb_func_end ObjAffineSet thumb_func_end ObjAffineSet
thumb_func_start RLUnCompVram thumb_func_start RLUnCompVram
RLUnCompVram: ; 82E70A0 RLUnCompVram: @ 82E70A0
swi 0x15 swi 0x15
bx lr bx lr
thumb_func_end RLUnCompVram thumb_func_end RLUnCompVram
thumb_func_start RLUnCompWram thumb_func_start RLUnCompWram
RLUnCompWram: ; 82E70A4 RLUnCompWram: @ 82E70A4
swi 0x14 swi 0x14
bx lr bx lr
thumb_func_end RLUnCompWram thumb_func_end RLUnCompWram
thumb_func_start RegisterRamReset thumb_func_start RegisterRamReset
; void RegisterRamReset(int ResetFlags) @ void RegisterRamReset(int ResetFlags)
RegisterRamReset: ; 82E70A8 RegisterRamReset: @ 82E70A8
swi 0x1 swi 0x1
bx lr bx lr
thumb_func_end RegisterRamReset thumb_func_end RegisterRamReset
thumb_func_start SoftReset thumb_func_start SoftReset
; void SoftReset() @ void SoftReset()
SoftReset: ; 82E70AC SoftReset: @ 82E70AC
ldr r3, =0x04000208 ldr r3, =0x04000208
movs r2, 0 movs r2, 0
strb r2, [r3] strb r2, [r3]
@@ -92,15 +92,15 @@ SoftReset: ; 82E70AC
thumb_func_end SoftReset thumb_func_end SoftReset
thumb_func_start Sqrt thumb_func_start Sqrt
; s16 Sqrt(int) @ s16 Sqrt(int)
Sqrt: ; 82E70C4 Sqrt: @ 82E70C4
swi 0x8 swi 0x8
bx lr bx lr
thumb_func_end Sqrt thumb_func_end Sqrt
thumb_func_start VBlankIntrWait thumb_func_start VBlankIntrWait
; void VBlankIntrWait() @ void VBlankIntrWait()
VBlankIntrWait: ; 82E70C8 VBlankIntrWait: @ 82E70C8
movs r2, 0 movs r2, 0
swi 0x5 swi 0x5
bx lr bx lr
asm/libgcc.s
+80 -80
View File
@@ -1,95 +1,95 @@
thumb_func_start _call_via_r0 thumb_func_start _call_via_r0
_call_via_r0: ; 82E70D0 _call_via_r0: @ 82E70D0
bx r0 bx r0
mov r8, r8 mov r8, r8
thumb_func_end _call_via_r0 thumb_func_end _call_via_r0
thumb_func_start _call_via_r1 thumb_func_start _call_via_r1
_call_via_r1: ; 82E70D4 _call_via_r1: @ 82E70D4
bx r1 bx r1
mov r8, r8 mov r8, r8
thumb_func_end _call_via_r1 thumb_func_end _call_via_r1
thumb_func_start _call_via_r2 thumb_func_start _call_via_r2
_call_via_r2: ; 82E70D8 _call_via_r2: @ 82E70D8
bx r2 bx r2
mov r8, r8 mov r8, r8
thumb_func_end _call_via_r2 thumb_func_end _call_via_r2
thumb_func_start _call_via_r3 thumb_func_start _call_via_r3
_call_via_r3: ; 82E70DC _call_via_r3: @ 82E70DC
bx r3 bx r3
mov r8, r8 mov r8, r8
thumb_func_end _call_via_r3 thumb_func_end _call_via_r3
thumb_func_start _call_via_r4 thumb_func_start _call_via_r4
_call_via_r4: ; 82E70E0 _call_via_r4: @ 82E70E0
bx r4 bx r4
mov r8, r8 mov r8, r8
thumb_func_end _call_via_r4 thumb_func_end _call_via_r4
thumb_func_start _call_via_r5 thumb_func_start _call_via_r5
_call_via_r5: ; 82E70E4 _call_via_r5: @ 82E70E4
bx r5 bx r5
mov r8, r8 mov r8, r8
thumb_func_end _call_via_r5 thumb_func_end _call_via_r5
thumb_func_start _call_via_r6 thumb_func_start _call_via_r6
_call_via_r6: ; 82E70E8 _call_via_r6: @ 82E70E8
bx r6 bx r6
mov r8, r8 mov r8, r8
thumb_func_end _call_via_r6 thumb_func_end _call_via_r6
thumb_func_start _call_via_r7 thumb_func_start _call_via_r7
_call_via_r7: ; 82E70EC _call_via_r7: @ 82E70EC
bx r7 bx r7
mov r8, r8 mov r8, r8
thumb_func_end _call_via_r7 thumb_func_end _call_via_r7
thumb_func_start _call_via_r8 thumb_func_start _call_via_r8
_call_via_r8: ; 82E70F0 _call_via_r8: @ 82E70F0
bx r8 bx r8
mov r8, r8 mov r8, r8
thumb_func_end _call_via_r8 thumb_func_end _call_via_r8
thumb_func_start _call_via_r9 thumb_func_start _call_via_r9
_call_via_r9: ; 82E70F4 _call_via_r9: @ 82E70F4
bx r9 bx r9
mov r8, r8 mov r8, r8
thumb_func_end _call_via_r9 thumb_func_end _call_via_r9
thumb_func_start _call_via_sl thumb_func_start _call_via_sl
_call_via_sl: ; 82E70F8 _call_via_sl: @ 82E70F8
bx r10 bx r10
mov r8, r8 mov r8, r8
thumb_func_end _call_via_sl thumb_func_end _call_via_sl
thumb_func_start _call_via_fp thumb_func_start _call_via_fp
_call_via_fp: ; 82E70FC _call_via_fp: @ 82E70FC
bx r11 bx r11
mov r8, r8 mov r8, r8
thumb_func_end _call_via_fp thumb_func_end _call_via_fp
thumb_func_start _call_via_ip thumb_func_start _call_via_ip
_call_via_ip: ; 82E7100 _call_via_ip: @ 82E7100
bx r12 bx r12
mov r8, r8 mov r8, r8
thumb_func_end _call_via_ip thumb_func_end _call_via_ip
thumb_func_start _call_via_sp thumb_func_start _call_via_sp
_call_via_sp: ; 82E7104 _call_via_sp: @ 82E7104
bx sp bx sp
mov r8, r8 mov r8, r8
thumb_func_end _call_via_sp thumb_func_end _call_via_sp
thumb_func_start _call_via_lr thumb_func_start _call_via_lr
_call_via_lr: ; 82E7108 _call_via_lr: @ 82E7108
bx lr bx lr
mov r8, r8 mov r8, r8
thumb_func_end _call_via_lr thumb_func_end _call_via_lr
thumb_func_start __divdi3 thumb_func_start __divdi3
__divdi3: ; 82E710C __divdi3: @ 82E710C
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -643,8 +643,8 @@ _082E753C: .4byte 0x0000ffff
thumb_func_end __divdi3 thumb_func_end __divdi3
thumb_func_start __divsi3 thumb_func_start __divsi3
; int __divsi3(int dividend, int divisor) @ int __divsi3(int dividend, int divisor)
__divsi3: ; 82E7540 __divsi3: @ 82E7540
cmp r1, 0 cmp r1, 0
beq _082E75C8 beq _082E75C8
push {r4} push {r4}
@@ -733,12 +733,12 @@ _082E75C8:
thumb_func_end __divsi3 thumb_func_end __divsi3
thumb_func_start nullsub_1 thumb_func_start nullsub_1
nullsub_1: ; 82E75D4 nullsub_1: @ 82E75D4
mov pc, lr mov pc, lr
thumb_func_end nullsub_1 thumb_func_end nullsub_1
thumb_func_start __fixunsdfsi thumb_func_start __fixunsdfsi
__fixunsdfsi: ; 82E75D8 __fixunsdfsi: @ 82E75D8
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r1, 0 adds r5, r1, 0
adds r4, r0, 0 adds r4, r0, 0
@@ -772,7 +772,7 @@ _082E7618: .4byte 0x00000000
thumb_func_end __fixunsdfsi thumb_func_end __fixunsdfsi
thumb_func_start __fixunssfsi thumb_func_start __fixunssfsi
__fixunssfsi: ; 82E761C __fixunssfsi: @ 82E761C
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
ldr r1, _082E7634 ldr r1, _082E7634
@@ -799,7 +799,7 @@ _082E764C: .4byte 0xcf000000
thumb_func_end __fixunssfsi thumb_func_end __fixunssfsi
thumb_func_start __modsi3 thumb_func_start __modsi3
__modsi3: ; 82E7650 __modsi3: @ 82E7650
movs r3, 0x1 movs r3, 0x1
cmp r1, 0 cmp r1, 0
beq _082E7714 beq _082E7714
@@ -921,7 +921,7 @@ _082E7714:
thumb_func_end __modsi3 thumb_func_end __modsi3
thumb_func_start __muldi3 thumb_func_start __muldi3
__muldi3: ; 82E7720 __muldi3: @ 82E7720
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x10 sub sp, 0x10
str r0, [sp] str r0, [sp]
@@ -982,7 +982,7 @@ _082E778C: .4byte 0x0000ffff
thumb_func_end __muldi3 thumb_func_end __muldi3
thumb_func_start __udivdi3 thumb_func_start __udivdi3
__udivdi3: ; 82E7790 __udivdi3: @ 82E7790
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -1485,8 +1485,8 @@ _082E7B64: .4byte 0x0000ffff
thumb_func_end __udivdi3 thumb_func_end __udivdi3
thumb_func_start __udivsi3 thumb_func_start __udivsi3
; unsigned int __udivsi3(unsigned int dividend, unsigned int divisor) @ unsigned int __udivsi3(unsigned int dividend, unsigned int divisor)
__udivsi3: ; 82E7B68 __udivsi3: @ 82E7B68
cmp r1, 0 cmp r1, 0
beq _082E7BD6 beq _082E7BD6
movs r3, 0x1 movs r3, 0x1
@@ -1559,8 +1559,8 @@ _082E7BD6:
thumb_func_end __udivsi3 thumb_func_end __udivsi3
thumb_func_start __umodsi3 thumb_func_start __umodsi3
; unsigned int __umodsi3(unsigned int dividend, unsigned int divisor) @ unsigned int __umodsi3(unsigned int dividend, unsigned int divisor)
__umodsi3: ; 82E7BE0 __umodsi3: @ 82E7BE0
cmp r1, 0 cmp r1, 0
beq _082E7C96 beq _082E7C96
movs r3, 0x1 movs r3, 0x1
@@ -1674,7 +1674,7 @@ _082E7C96:
thumb_func_end __umodsi3 thumb_func_end __umodsi3
thumb_func_start __pack_d thumb_func_start __pack_d
__pack_d: ; 82E7CA0 __pack_d: @ 82E7CA0
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x8 sub sp, 0x8
adds r1, r0, 0 adds r1, r0, 0
@@ -1847,7 +1847,7 @@ _082E7DE4: .4byte 0xffff800f
thumb_func_end __pack_d thumb_func_end __pack_d
thumb_func_start __unpack_d thumb_func_start __unpack_d
__unpack_d: ; 82E7DE8 __unpack_d: @ 82E7DE8
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x8 sub sp, 0x8
adds r2, r0, 0 adds r2, r0, 0
@@ -1963,7 +1963,7 @@ _082E7EBC: .4byte 0x10000000
thumb_func_end __unpack_d thumb_func_end __unpack_d
thumb_func_start __fpadd_parts_d thumb_func_start __fpadd_parts_d
__fpadd_parts_d: ; 82E7EC0 __fpadd_parts_d: @ 82E7EC0
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -2305,8 +2305,8 @@ _082E8128: .4byte 0x1fffffff
thumb_func_end __fpadd_parts_d thumb_func_end __fpadd_parts_d
thumb_func_start __adddf3 thumb_func_start __adddf3
; double __adddf3(double arg_a, double arg_b) @ double __adddf3(double arg_a, double arg_b)
__adddf3: ; 82E812C __adddf3: @ 82E812C
push {r4,lr} push {r4,lr}
sub sp, 0x4C sub sp, 0x4C
str r0, [sp, 0x3C] str r0, [sp, 0x3C]
@@ -2330,7 +2330,7 @@ __adddf3: ; 82E812C
thumb_func_end __adddf3 thumb_func_end __adddf3
thumb_func_start __subdf3 thumb_func_start __subdf3
__subdf3: ; 82E815C __subdf3: @ 82E815C
push {r4,lr} push {r4,lr}
sub sp, 0x4C sub sp, 0x4C
str r0, [sp, 0x3C] str r0, [sp, 0x3C]
@@ -2358,7 +2358,7 @@ __subdf3: ; 82E815C
thumb_func_end __subdf3 thumb_func_end __subdf3
thumb_func_start __muldf3 thumb_func_start __muldf3
__muldf3: ; 82E8194 __muldf3: @ 82E8194
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -2720,7 +2720,7 @@ _082E8438: .4byte 0x0fffffff
thumb_func_end __muldf3 thumb_func_end __muldf3
thumb_func_start __divdf3 thumb_func_start __divdf3
__divdf3: ; 82E843C __divdf3: @ 82E843C
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x48 sub sp, 0x48
str r0, [sp, 0x28] str r0, [sp, 0x28]
@@ -2937,7 +2937,7 @@ _082E85C0: .4byte 0x10000000
thumb_func_end __divdf3 thumb_func_end __divdf3
thumb_func_start __fpcmp_parts_d thumb_func_start __fpcmp_parts_d
__fpcmp_parts_d: ; 82E85C4 __fpcmp_parts_d: @ 82E85C4
push {r4-r6,lr} push {r4-r6,lr}
adds r5, r0, 0 adds r5, r0, 0
adds r6, r1, 0 adds r6, r1, 0
@@ -3094,7 +3094,7 @@ _082E86C0:
thumb_func_end __fpcmp_parts_d thumb_func_end __fpcmp_parts_d
thumb_func_start __cmpdf2 thumb_func_start __cmpdf2
__cmpdf2: ; 82E86C4 __cmpdf2: @ 82E86C4
push {r4,lr} push {r4,lr}
sub sp, 0x38 sub sp, 0x38
str r0, [sp, 0x28] str r0, [sp, 0x28]
@@ -3116,7 +3116,7 @@ __cmpdf2: ; 82E86C4
thumb_func_end __cmpdf2 thumb_func_end __cmpdf2
thumb_func_start __eqdf2 thumb_func_start __eqdf2
__eqdf2: ; 82E86F0 __eqdf2: @ 82E86F0
push {r4,lr} push {r4,lr}
sub sp, 0x38 sub sp, 0x38
str r0, [sp, 0x28] str r0, [sp, 0x28]
@@ -3159,7 +3159,7 @@ _082E8736:
thumb_func_end __eqdf2 thumb_func_end __eqdf2
thumb_func_start __nedf2 thumb_func_start __nedf2
__nedf2: ; 82E873C __nedf2: @ 82E873C
push {r4,lr} push {r4,lr}
sub sp, 0x38 sub sp, 0x38
str r0, [sp, 0x28] str r0, [sp, 0x28]
@@ -3202,7 +3202,7 @@ _082E8782:
thumb_func_end __nedf2 thumb_func_end __nedf2
thumb_func_start __gtdf2 thumb_func_start __gtdf2
__gtdf2: ; 82E8788 __gtdf2: @ 82E8788
push {r4,lr} push {r4,lr}
sub sp, 0x38 sub sp, 0x38
str r0, [sp, 0x28] str r0, [sp, 0x28]
@@ -3246,8 +3246,8 @@ _082E87D0:
thumb_func_end __gtdf2 thumb_func_end __gtdf2
thumb_func_start __gedf2 thumb_func_start __gedf2
; int __gedf2(double arg_a, double arg_b) @ int __gedf2(double arg_a, double arg_b)
__gedf2: ; 82E87D4 __gedf2: @ 82E87D4
push {r4,lr} push {r4,lr}
sub sp, 0x38 sub sp, 0x38
str r0, [sp, 0x28] str r0, [sp, 0x28]
@@ -3291,7 +3291,7 @@ _082E881C:
thumb_func_end __gedf2 thumb_func_end __gedf2
thumb_func_start __ltdf2 thumb_func_start __ltdf2
__ltdf2: ; 82E8820 __ltdf2: @ 82E8820
push {r4,lr} push {r4,lr}
sub sp, 0x38 sub sp, 0x38
str r0, [sp, 0x28] str r0, [sp, 0x28]
@@ -3334,7 +3334,7 @@ _082E8866:
thumb_func_end __ltdf2 thumb_func_end __ltdf2
thumb_func_start __ledf2 thumb_func_start __ledf2
__ledf2: ; 82E886C __ledf2: @ 82E886C
push {r4,lr} push {r4,lr}
sub sp, 0x38 sub sp, 0x38
str r0, [sp, 0x28] str r0, [sp, 0x28]
@@ -3377,7 +3377,7 @@ _082E88B2:
thumb_func_end __ledf2 thumb_func_end __ledf2
thumb_func_start __floatsidf thumb_func_start __floatsidf
__floatsidf: ; 82E88B8 __floatsidf: @ 82E88B8
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x14 sub sp, 0x14
adds r2, r0, 0 adds r2, r0, 0
@@ -3447,8 +3447,8 @@ _082E8930: .4byte 0x0fffffff
thumb_func_end __floatsidf thumb_func_end __floatsidf
thumb_func_start __fixdfsi thumb_func_start __fixdfsi
; int __fixdfsi(double arg_a) @ int __fixdfsi(double arg_a)
__fixdfsi: ; 82E8934 __fixdfsi: @ 82E8934
push {lr} push {lr}
sub sp, 0x1C sub sp, 0x1C
str r0, [sp, 0x14] str r0, [sp, 0x14]
@@ -3515,7 +3515,7 @@ _082E89A2:
thumb_func_end __fixdfsi thumb_func_end __fixdfsi
thumb_func_start __negdf2 thumb_func_start __negdf2
__negdf2: ; 82E89A8 __negdf2: @ 82E89A8
push {lr} push {lr}
sub sp, 0x1C sub sp, 0x1C
str r0, [sp, 0x14] str r0, [sp, 0x14]
@@ -3537,7 +3537,7 @@ _082E89C2:
thumb_func_end __negdf2 thumb_func_end __negdf2
thumb_func_start __make_dp thumb_func_start __make_dp
__make_dp: ; 82E89D0 __make_dp: @ 82E89D0
sub sp, 0x4 sub sp, 0x4
push {r4,lr} push {r4,lr}
sub sp, 0x14 sub sp, 0x14
@@ -3559,7 +3559,7 @@ __make_dp: ; 82E89D0
thumb_func_end __make_dp thumb_func_end __make_dp
thumb_func_start __truncdfsf2 thumb_func_start __truncdfsf2
__truncdfsf2: ; 82E89F8 __truncdfsf2: @ 82E89F8
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x1C sub sp, 0x1C
str r0, [sp, 0x14] str r0, [sp, 0x14]
@@ -3596,7 +3596,7 @@ _082E8A38: .4byte 0x3fffffff
thumb_func_end __truncdfsf2 thumb_func_end __truncdfsf2
thumb_func_start __pack_f thumb_func_start __pack_f
__pack_f: ; 82E8A3C __pack_f: @ 82E8A3C
push {r4-r6,lr} push {r4-r6,lr}
ldr r2, [r0, 0xC] ldr r2, [r0, 0xC]
ldr r6, [r0, 0x4] ldr r6, [r0, 0x4]
@@ -3702,7 +3702,7 @@ _082E8AF0: .4byte 0x7fffffff
thumb_func_end __pack_f thumb_func_end __pack_f
thumb_func_start __unpack_f thumb_func_start __unpack_f
__unpack_f: ; 82E8AF4 __unpack_f: @ 82E8AF4
push {r4,lr} push {r4,lr}
adds r3, r1, 0 adds r3, r1, 0
ldr r0, [r0] ldr r0, [r0]
@@ -3775,7 +3775,7 @@ _082E8B6C:
thumb_func_end __unpack_f thumb_func_end __unpack_f
thumb_func_start __fpadd_parts_f thumb_func_start __fpadd_parts_f
__fpadd_parts_f: ; 82E8B70 __fpadd_parts_f: @ 82E8B70
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -3998,7 +3998,7 @@ _082E8CE4:
thumb_func_end __fpadd_parts_f thumb_func_end __fpadd_parts_f
thumb_func_start __addsf3 thumb_func_start __addsf3
__addsf3: ; 82E8CEC __addsf3: @ 82E8CEC
push {r4,lr} push {r4,lr}
sub sp, 0x38 sub sp, 0x38
str r0, [sp, 0x30] str r0, [sp, 0x30]
@@ -4020,7 +4020,7 @@ __addsf3: ; 82E8CEC
thumb_func_end __addsf3 thumb_func_end __addsf3
thumb_func_start __subsf3 thumb_func_start __subsf3
__subsf3: ; 82E8D18 __subsf3: @ 82E8D18
push {r4,lr} push {r4,lr}
sub sp, 0x38 sub sp, 0x38
str r0, [sp, 0x30] str r0, [sp, 0x30]
@@ -4046,7 +4046,7 @@ __subsf3: ; 82E8D18
thumb_func_end __subsf3 thumb_func_end __subsf3
thumb_func_start __mulsf3 thumb_func_start __mulsf3
__mulsf3: ; 82E8D4C __mulsf3: @ 82E8D4C
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r9 mov r7, r9
mov r6, r8 mov r6, r8
@@ -4249,7 +4249,7 @@ _082E8EAC: .4byte 0x3fffffff
thumb_func_end __mulsf3 thumb_func_end __mulsf3
thumb_func_start __divsf3 thumb_func_start __divsf3
__divsf3: ; 82E8EB0 __divsf3: @ 82E8EB0
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x28 sub sp, 0x28
str r0, [sp, 0x20] str r0, [sp, 0x20]
@@ -4385,7 +4385,7 @@ _082E8F90:
thumb_func_end __divsf3 thumb_func_end __divsf3
thumb_func_start __fpcmp_parts_f thumb_func_start __fpcmp_parts_f
__fpcmp_parts_f: ; 82E8F9C __fpcmp_parts_f: @ 82E8F9C
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r0, 0 movs r0, 0
@@ -4528,7 +4528,7 @@ _082E907E:
thumb_func_end __fpcmp_parts_f thumb_func_end __fpcmp_parts_f
thumb_func_start __cmpsf2 thumb_func_start __cmpsf2
__cmpsf2: ; 82E9080 __cmpsf2: @ 82E9080
push {r4,lr} push {r4,lr}
sub sp, 0x28 sub sp, 0x28
str r0, [sp, 0x20] str r0, [sp, 0x20]
@@ -4548,7 +4548,7 @@ __cmpsf2: ; 82E9080
thumb_func_end __cmpsf2 thumb_func_end __cmpsf2
thumb_func_start __eqsf2 thumb_func_start __eqsf2
__eqsf2: ; 82E90A8 __eqsf2: @ 82E90A8
push {r4,lr} push {r4,lr}
sub sp, 0x28 sub sp, 0x28
str r0, [sp, 0x20] str r0, [sp, 0x20]
@@ -4589,7 +4589,7 @@ _082E90EA:
thumb_func_end __eqsf2 thumb_func_end __eqsf2
thumb_func_start __nesf2 thumb_func_start __nesf2
__nesf2: ; 82E90F0 __nesf2: @ 82E90F0
push {r4,lr} push {r4,lr}
sub sp, 0x28 sub sp, 0x28
str r0, [sp, 0x20] str r0, [sp, 0x20]
@@ -4630,7 +4630,7 @@ _082E9132:
thumb_func_end __nesf2 thumb_func_end __nesf2
thumb_func_start __gtsf2 thumb_func_start __gtsf2
__gtsf2: ; 82E9138 __gtsf2: @ 82E9138
push {r4,lr} push {r4,lr}
sub sp, 0x28 sub sp, 0x28
str r0, [sp, 0x20] str r0, [sp, 0x20]
@@ -4672,7 +4672,7 @@ _082E917C:
thumb_func_end __gtsf2 thumb_func_end __gtsf2
thumb_func_start __gesf2 thumb_func_start __gesf2
__gesf2: ; 82E9180 __gesf2: @ 82E9180
push {r4,lr} push {r4,lr}
sub sp, 0x28 sub sp, 0x28
str r0, [sp, 0x20] str r0, [sp, 0x20]
@@ -4714,7 +4714,7 @@ _082E91C4:
thumb_func_end __gesf2 thumb_func_end __gesf2
thumb_func_start __ltsf2 thumb_func_start __ltsf2
__ltsf2: ; 82E91C8 __ltsf2: @ 82E91C8
push {r4,lr} push {r4,lr}
sub sp, 0x28 sub sp, 0x28
str r0, [sp, 0x20] str r0, [sp, 0x20]
@@ -4755,7 +4755,7 @@ _082E920A:
thumb_func_end __ltsf2 thumb_func_end __ltsf2
thumb_func_start __lesf2 thumb_func_start __lesf2
__lesf2: ; 82E9210 __lesf2: @ 82E9210
push {r4,lr} push {r4,lr}
sub sp, 0x28 sub sp, 0x28
str r0, [sp, 0x20] str r0, [sp, 0x20]
@@ -4796,7 +4796,7 @@ _082E9252:
thumb_func_end __lesf2 thumb_func_end __lesf2
thumb_func_start __floatsisf thumb_func_start __floatsisf
__floatsisf: ; 82E9258 __floatsisf: @ 82E9258
push {lr} push {lr}
sub sp, 0x10 sub sp, 0x10
adds r1, r0, 0 adds r1, r0, 0
@@ -4853,7 +4853,7 @@ _082E92B4: .4byte 0x3fffffff
thumb_func_end __floatsisf thumb_func_end __floatsisf
thumb_func_start __fixsfsi thumb_func_start __fixsfsi
__fixsfsi: ; 82E92B8 __fixsfsi: @ 82E92B8
push {lr} push {lr}
sub sp, 0x14 sub sp, 0x14
str r0, [sp, 0x10] str r0, [sp, 0x10]
@@ -4917,7 +4917,7 @@ _082E931C:
thumb_func_end __fixsfsi thumb_func_end __fixsfsi
thumb_func_start __negsf2 thumb_func_start __negsf2
__negsf2: ; 82E9320 __negsf2: @ 82E9320
push {lr} push {lr}
sub sp, 0x14 sub sp, 0x14
str r0, [sp, 0x10] str r0, [sp, 0x10]
@@ -4938,7 +4938,7 @@ _082E9338:
thumb_func_end __negsf2 thumb_func_end __negsf2
thumb_func_start __make_fp thumb_func_start __make_fp
__make_fp: ; 82E9344 __make_fp: @ 82E9344
push {lr} push {lr}
sub sp, 0x10 sub sp, 0x10
str r0, [sp] str r0, [sp]
@@ -4952,7 +4952,7 @@ __make_fp: ; 82E9344
thumb_func_end __make_fp thumb_func_end __make_fp
thumb_func_start __extendsfdf2 thumb_func_start __extendsfdf2
__extendsfdf2: ; 82E935C __extendsfdf2: @ 82E935C
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x18 sub sp, 0x18
str r0, [sp, 0x14] str r0, [sp, 0x14]
@@ -4976,7 +4976,7 @@ __extendsfdf2: ; 82E935C
thumb_func_end __extendsfdf2 thumb_func_end __extendsfdf2
thumb_func_start __lshrdi3 thumb_func_start __lshrdi3
__lshrdi3: ; 82E9388 __lshrdi3: @ 82E9388
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r1, 0 adds r6, r1, 0
adds r5, r0, 0 adds r5, r0, 0
@@ -5008,7 +5008,7 @@ _082E93B8:
thumb_func_end __lshrdi3 thumb_func_end __lshrdi3
thumb_func_start __negdi2 thumb_func_start __negdi2
__negdi2: ; 82E93BC __negdi2: @ 82E93BC
push {r4,lr} push {r4,lr}
negs r2, r0 negs r2, r0
adds r3, r2, 0 adds r3, r2, 0
@@ -5024,8 +5024,8 @@ _082E93CA:
thumb_func_end __negdi2 thumb_func_end __negdi2
thumb_func_start memcpy thumb_func_start memcpy
; void *memcpy(void *dest, void *src, int size) @ void *memcpy(void *dest, void *src, int size)
memcpy: ; 82E93D4 memcpy: @ 82E93D4
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r0, 0 adds r5, r0, 0
adds r4, r5, 0 adds r4, r5, 0
@@ -5082,8 +5082,8 @@ _082E942E:
thumb_func_end memcpy thumb_func_end memcpy
thumb_func_start memset thumb_func_start memset
; void *memset(void *dest, char c, int size) @ void *memset(void *dest, char c, int size)
memset: ; 82E9434 memset: @ 82E9434
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r0, 0 adds r5, r0, 0
adds r4, r1, 0 adds r4, r1, 0
@@ -5133,8 +5133,8 @@ _082E947A:
thumb_func_end memset thumb_func_end memset
thumb_func_start strcmp thumb_func_start strcmp
; int strcmp(char *s1, char *s2) @ int strcmp(char *s1, char *s2)
strcmp: ; 82E9488 strcmp: @ 82E9488
push {r4,r5,lr} push {r4,r5,lr}
adds r2, r0, 0 adds r2, r0, 0
adds r3, r1, 0 adds r3, r1, 0
@@ -5188,7 +5188,7 @@ _082E94E0:
thumb_func_end strcmp thumb_func_end strcmp
thumb_func_start strcat thumb_func_start strcat
strcat: ; 82E94E4 strcat: @ 82E94E4
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r0, 0 adds r6, r0, 0
adds r3, r6, 0 adds r3, r6, 0
asm/libgcnmultiboot.s
+68 -68
View File
@@ -1,12 +1,12 @@
; This library can be used to download and execute a multi-boot image from @ This library can be used to download and execute a multi-boot image from
; a GameCube using the JOY Bus protocol over the link cable. @ a GameCube using the JOY Bus protocol over the link cable.
.set GCMB_STRUCT_BASE_DEST_PTR, 0x20 .set GCMB_STRUCT_BASE_DEST_PTR, 0x20
.set GCMB_STRUCT_CUR_DEST_PTR, 0x24 .set GCMB_STRUCT_CUR_DEST_PTR, 0x24
.set GCMB_STRUCT_SERIAL_INTR_HANDLER, 0x28 .set GCMB_STRUCT_SERIAL_INTR_HANDLER, 0x28
thumb_func_start GameCubeMultiBoot_Hash thumb_func_start GameCubeMultiBoot_Hash
GameCubeMultiBoot_Hash: ; 82DED70 GameCubeMultiBoot_Hash: @ 82DED70
push {r4,lr} push {r4,lr}
ldr r4, pool_HashVal ldr r4, pool_HashVal
eors r3, r1 eors r3, r1
@@ -26,8 +26,8 @@ $skipEor:
thumb_func_end GameCubeMultiBoot_Hash thumb_func_end GameCubeMultiBoot_Hash
thumb_func_start GameCubeMultiBoot_Main thumb_func_start GameCubeMultiBoot_Main
; void GameCubeMultiBoot_Main(struct GameCubeMultiBoot *mb); @ void GameCubeMultiBoot_Main(struct GameCubeMultiBoot *mb);
GameCubeMultiBoot_Main: ; 82DED84 GameCubeMultiBoot_Main: @ 82DED84
ldr r1, [r0, GCMB_STRUCT_SERIAL_INTR_HANDLER] ldr r1, [r0, GCMB_STRUCT_SERIAL_INTR_HANDLER]
cmp r1, 0 cmp r1, 0
beq _082DEDAA beq _082DEDAA
@@ -166,13 +166,13 @@ _082DEE76:
pool_HashVal: .4byte 0xa1c1 pool_HashVal: .4byte 0xa1c1
pool_Kawa: .ascii "Kawa" ; name of BIOS developer pool_Kawa: .ascii "Kawa" @ name of BIOS developer
pool_NintendoLogo: .4byte RomHeaderNintendoLogo pool_NintendoLogo: .4byte RomHeaderNintendoLogo
thumb_func_start GameCubeMultiBoot_ExecuteProgram thumb_func_start GameCubeMultiBoot_ExecuteProgram
; void GameCubeMultiBoot_ExecuteProgram(struct GameCubeMultiBoot *mb); @ void GameCubeMultiBoot_ExecuteProgram(struct GameCubeMultiBoot *mb);
GameCubeMultiBoot_ExecuteProgram: ; 82DEE84 GameCubeMultiBoot_ExecuteProgram: @ 82DEE84
ldrb r1, [r0, 0x2] ldrb r1, [r0, 0x2]
cmp r1, 0x2 cmp r1, 0x2
bne $unableToExecute bne $unableToExecute
@@ -187,20 +187,20 @@ $unableToExecute:
thumb_func_end GameCubeMultiBoot_ExecuteProgram thumb_func_end GameCubeMultiBoot_ExecuteProgram
thumb_func_start GameCubeMultiBoot_Init thumb_func_start GameCubeMultiBoot_Init
; void GameCubeMultiBoot_Init(struct GameCubeMultiBoot *mb); @ void GameCubeMultiBoot_Init(struct GameCubeMultiBoot *mb);
GameCubeMultiBoot_Init: ; 82DEE98 GameCubeMultiBoot_Init: @ 82DEE98
ldr r3, pool_InterruptRegs ldr r3, pool_InterruptRegs
; Save IME register. @ Save IME register.
ldrh r2, [r3, OFFSET_REG_IME - 0x200] ldrh r2, [r3, OFFSET_REG_IME - 0x200]
; Disable interrupts. @ Disable interrupts.
movs r1, 0 movs r1, 0
strh r1, [r3, OFFSET_REG_IME - 0x200] strh r1, [r3, OFFSET_REG_IME - 0x200]
; Set the handler to the "Stop" routine. @ Set the handler to the "Stop" routine.
; Unless the first command that is received is a device reset command, the @ Unless the first command that is received is a device reset command, the
; "Stop" routine will be executed and no further commands will be processed. @ "Stop" routine will be executed and no further commands will be processed.
adr r3, GcMbIntrHandler_Stop adr r3, GcMbIntrHandler_Stop
str r3, [r0, GCMB_STRUCT_SERIAL_INTR_HANDLER] str r3, [r0, GCMB_STRUCT_SERIAL_INTR_HANDLER]
@@ -212,7 +212,7 @@ GameCubeMultiBoot_Init: ; 82DEE98
adds r3, r0, 0 adds r3, r0, 0
adds r3, GCMB_STRUCT_BASE_DEST_PTR adds r3, GCMB_STRUCT_BASE_DEST_PTR
; clear all but the last 3 fields of the struct @ clear all but the last 3 fields of the struct
$clearStructLoop: $clearStructLoop:
stm r0!, {r1} stm r0!, {r1}
cmp r0, r3 cmp r0, r3
@@ -226,43 +226,43 @@ $clearStructLoop:
ldr r3, pool_SerialRegs ldr r3, pool_SerialRegs
; Turn off JOY Bus mode. @ Turn off JOY Bus mode.
lsls r0, r3, 10 lsls r0, r3, 10
strh r0, [r3, OFFSET_REG_RCNT - 0x120] strh r0, [r3, OFFSET_REG_RCNT - 0x120]
; Turn on JOY Bus mode. @ Turn on JOY Bus mode.
movs r0, 0xC0 movs r0, 0xC0
lsls r0, 8 lsls r0, 8
strh r0, [r3, OFFSET_REG_RCNT - 0x120] strh r0, [r3, OFFSET_REG_RCNT - 0x120]
; Init JOY Bus registers. @ Init JOY Bus registers.
movs r0, 0x47 movs r0, 0x47
strh r0, [r3, OFFSET_REG_JOYCNT - 0x120] strh r0, [r3, OFFSET_REG_JOYCNT - 0x120]
strh r1, [r3, OFFSET_REG_JOYSTAT - 0x120] strh r1, [r3, OFFSET_REG_JOYSTAT - 0x120]
ldr r3, pool_InterruptRegs ldr r3, pool_InterruptRegs
; Acknowledge serial interrupt. @ Acknowledge serial interrupt.
movs r0, INTR_FLAG_SERIAL movs r0, INTR_FLAG_SERIAL
strh r0, [r3, OFFSET_REG_IF - 0x200] strh r0, [r3, OFFSET_REG_IF - 0x200]
; Enable serial interrupt. @ Enable serial interrupt.
ldrh r1, [r3, OFFSET_REG_IE - 0x200] ldrh r1, [r3, OFFSET_REG_IE - 0x200]
orrs r1, r0 orrs r1, r0
strh r1, [r3, OFFSET_REG_IE - 0x200] strh r1, [r3, OFFSET_REG_IE - 0x200]
; Restore IME register. @ Restore IME register.
strh r2, [r3, OFFSET_REG_IME - 0x200] strh r2, [r3, OFFSET_REG_IME - 0x200]
bx lr bx lr
thumb_func_end GameCubeMultiBoot_Init thumb_func_end GameCubeMultiBoot_Init
non_word_aligned_thumb_func_start GameCubeMultiBoot_HandleSerialInterrupt non_word_aligned_thumb_func_start GameCubeMultiBoot_HandleSerialInterrupt
; void GameCubeMultiBoot_HandleSerialInterrupt(struct GameCubeMultiBoot *mb); @ void GameCubeMultiBoot_HandleSerialInterrupt(struct GameCubeMultiBoot *mb);
GameCubeMultiBoot_HandleSerialInterrupt: ; 82DEEE2 GameCubeMultiBoot_HandleSerialInterrupt: @ 82DEEE2
ldr r3, pool_SerialRegs ldr r3, pool_SerialRegs
; Acknowledge reset/receive/send flags. @ Acknowledge reset/receive/send flags.
ldrh r1, [r3, OFFSET_REG_JOYCNT - 0x120] ldrh r1, [r3, OFFSET_REG_JOYCNT - 0x120]
strh r1, [r3, OFFSET_REG_JOYCNT - 0x120] strh r1, [r3, OFFSET_REG_JOYCNT - 0x120]
@@ -273,16 +273,16 @@ GameCubeMultiBoot_HandleSerialInterrupt: ; 82DEEE2
cmp r2, 0 cmp r2, 0
beq GameCubeMultiBoot_HandleSerialInterruptDone beq GameCubeMultiBoot_HandleSerialInterruptDone
lsrs r1, 1 ; was a device reset command received? lsrs r1, 1 @ was a device reset command received?
bcs GameCubeMultiBoot_BeginHandshake ; branch if so bcs GameCubeMultiBoot_BeginHandshake @ branch if so
mov pc, r2 mov pc, r2
.align 2, 0 .align 2, 0
; Zero the status and the interrupt handler pointer. @ Zero the status and the interrupt handler pointer.
; Commands from the GameCube will not be processed after this is executed @ Commands from the GameCube will not be processed after this is executed
; unless GameCubeMultiBoot_Init() is called again. @ unless GameCubeMultiBoot_Init() is called again.
GcMbIntrHandler_Stop: GcMbIntrHandler_Stop:
movs r2, 0 movs r2, 0
strh r2, [r3, OFFSET_REG_JOYSTAT - 0x120] strh r2, [r3, OFFSET_REG_JOYSTAT - 0x120]
@@ -317,27 +317,27 @@ GameCubeMultiBoot_BeginHandshake:
.align 2, 0 .align 2, 0
GcMbIntrHandler_CheckGameCodeSent: ; 82DEF24 GcMbIntrHandler_CheckGameCodeSent: @ 82DEF24
lsls r1, 31 lsls r1, 31
bcc GcMbIntrHandler_Stop ; stop if send failed bcc GcMbIntrHandler_Stop @ stop if send failed
bmi GameCubeMultiBoot_CheckHandshakeResponse ; branch if receive is complete bmi GameCubeMultiBoot_CheckHandshakeResponse @ branch if receive is complete
; If the response hasn't been fully received yet, @ If the response hasn't been fully received yet,
; check again upon the next interrupt. @ check again upon the next interrupt.
adr r2, GcMbIntrHandler_CheckHandshakeResponse adr r2, GcMbIntrHandler_CheckHandshakeResponse
b GameCubeMultiBoot_SetInterruptHandler b GameCubeMultiBoot_SetInterruptHandler
.align 2, 0 .align 2, 0
GcMbIntrHandler_CheckHandshakeResponse: ; 82DEF30 GcMbIntrHandler_CheckHandshakeResponse: @ 82DEF30
lsrs r1, 1 ; is receive complete? lsrs r1, 1 @ is receive complete?
bcc GcMbIntrHandler_Stop ; stop if not bcc GcMbIntrHandler_Stop @ stop if not
GameCubeMultiBoot_CheckHandshakeResponse: GameCubeMultiBoot_CheckHandshakeResponse:
ldr r1, [r3, OFFSET_REG_JOY_RECV - 0x120] ldr r1, [r3, OFFSET_REG_JOY_RECV - 0x120]
ldr r2, pool_RubyUSAGameCode ldr r2, pool_RubyUSAGameCode
cmp r1, r2 cmp r1, r2
bne GcMbIntrHandler_Stop ; stop if the GameCube didn't reply with the same game code bne GcMbIntrHandler_Stop @ stop if the GameCube didn't reply with the same game code
ldrb r1, [r0, 0x3] ldrb r1, [r0, 0x3]
strb r1, [r0, 0xB] strb r1, [r0, 0xB]
adr r2, GcMbIntrHandler_82DEF44 adr r2, GcMbIntrHandler_82DEF44
@@ -345,9 +345,9 @@ GameCubeMultiBoot_CheckHandshakeResponse:
.align 2, 0 .align 2, 0
GcMbIntrHandler_82DEF44: ; 82DEF44 GcMbIntrHandler_82DEF44: @ 82DEF44
lsrs r1, 1 ; is receive complete? lsrs r1, 1 @ is receive complete?
bcc GcMbIntrHandler_Stop ; branch if not bcc GcMbIntrHandler_Stop @ branch if not
ldr r1, [r3, OFFSET_REG_JOY_RECV - 0x120] ldr r1, [r3, OFFSET_REG_JOY_RECV - 0x120]
lsrs r2, r1, 24 lsrs r2, r1, 24
cmp r2, 0xDD cmp r2, 0xDD
@@ -383,18 +383,18 @@ _082DEF72:
.align 2, 0 .align 2, 0
GcMbIntrHandler_82DEF84: ; 82DEF84 GcMbIntrHandler_82DEF84: @ 82DEF84
lsls r1, 31 lsls r1, 31
bcc GcMbIntrHandler_Stop ; stop if send failed bcc GcMbIntrHandler_Stop @ stop if send failed
bmi _082DEF94 ; branch if receive is complete bmi _082DEF94 @ branch if receive is complete
adr r2, GcMbIntrHandler_82DEF90 adr r2, GcMbIntrHandler_82DEF90
b GameCubeMultiBoot_SetInterruptHandler b GameCubeMultiBoot_SetInterruptHandler
.align 2, 0 .align 2, 0
GcMbIntrHandler_82DEF90: ; 82DEF90 GcMbIntrHandler_82DEF90: @ 82DEF90
lsrs r1, 1 ; is receive complete? lsrs r1, 1 @ is receive complete?
bcc GcMbIntrHandler_Stop ; branch if not bcc GcMbIntrHandler_Stop @ branch if not
_082DEF94: _082DEF94:
ldr r1, [r3, OFFSET_REG_JOY_RECV - 0x120] ldr r1, [r3, OFFSET_REG_JOY_RECV - 0x120]
ldr r2, _082DF034 ldr r2, _082DF034
@@ -415,9 +415,9 @@ _082DEFA6:
.align 2, 0 .align 2, 0
GcMbIntrHandler_82DEFB4: ; 82DEFB4 GcMbIntrHandler_82DEFB4: @ 82DEFB4
lsrs r1, 1 ; is receive complete? lsrs r1, 1 @ is receive complete?
bcc GcMbIntrHandler_Stop ; branch if not bcc GcMbIntrHandler_Stop @ branch if not
ldr r2, [r0, GCMB_STRUCT_CUR_DEST_PTR] ldr r2, [r0, GCMB_STRUCT_CUR_DEST_PTR]
movs r1, 0x4 movs r1, 0x4
ands r1, r2 ands r1, r2
@@ -456,18 +456,18 @@ _082DEFE2:
.align 2, 0 .align 2, 0
GcMbIntrHandler_82DEFF0: ; 82DEFF0 GcMbIntrHandler_82DEFF0: @ 82DEFF0
lsls r1, 31 lsls r1, 31
bcc _082DEFE2 ; branch if send failed bcc _082DEFE2 @ branch if send failed
bmi _082DF000 ; branch if receive is complete bmi _082DF000 @ branch if receive is complete
adr r2, GcMbIntrHandler_82DEFFC adr r2, GcMbIntrHandler_82DEFFC
b GameCubeMultiBoot_SetInterruptHandler b GameCubeMultiBoot_SetInterruptHandler
.align 2, 0 .align 2, 0
GcMbIntrHandler_82DEFFC: ; 82DEFFC GcMbIntrHandler_82DEFFC: @ 82DEFFC
lsrs r1, 1 ; is receive complete? lsrs r1, 1 @ is receive complete?
bcc _082DEFE2 ; branch if not bcc _082DEFE2 @ branch if not
_082DF000: _082DF000:
ldr r1, [r3, OFFSET_REG_JOY_RECV - 0x120] ldr r1, [r3, OFFSET_REG_JOY_RECV - 0x120]
@@ -480,45 +480,45 @@ _082DF000:
.align 2, 0 .align 2, 0
GcMbIntrHandler_82DF010: ; 82DF010 GcMbIntrHandler_82DF010: @ 82DF010
b GcMbIntrHandler_Stop b GcMbIntrHandler_Stop
thumb_func_end GameCubeMultiBoot_HandleSerialInterrupt thumb_func_end GameCubeMultiBoot_HandleSerialInterrupt
non_word_aligned_thumb_func_start GameCubeMultiBoot_Quit non_word_aligned_thumb_func_start GameCubeMultiBoot_Quit
; void GameCubeMultiBoot_Quit(); @ void GameCubeMultiBoot_Quit();
GameCubeMultiBoot_Quit: ; 82DF012 GameCubeMultiBoot_Quit: @ 82DF012
ldr r3, pool_InterruptRegs ldr r3, pool_InterruptRegs
; Save IME register. @ Save IME register.
ldrh r2, [r3, OFFSET_REG_IME - 0x200] ldrh r2, [r3, OFFSET_REG_IME - 0x200]
; Disable interrupts. @ Disable interrupts.
movs r1, 0 movs r1, 0
strh r1, [r3, OFFSET_REG_IME - 0x200] strh r1, [r3, OFFSET_REG_IME - 0x200]
ldr r3, pool_SerialRegs ldr r3, pool_SerialRegs
; Acknowledge all JOYCNT flags. @ Acknowledge all JOYCNT flags.
movs r0, 0x7 movs r0, 0x7
strh r0, [r3, OFFSET_REG_JOYCNT - 0x120] strh r0, [r3, OFFSET_REG_JOYCNT - 0x120]
; Turn off JOY Bus mode. @ Turn off JOY Bus mode.
lsls r0, r3, 10 lsls r0, r3, 10
strh r0, [r3, OFFSET_REG_RCNT - 0x120] ; store 0x8000 strh r0, [r3, OFFSET_REG_RCNT - 0x120] @ store 0x8000
ldr r3, pool_InterruptRegs ldr r3, pool_InterruptRegs
; Acknowledge serial interrupt. @ Acknowledge serial interrupt.
movs r0, INTR_FLAG_SERIAL movs r0, INTR_FLAG_SERIAL
strh r0, [r3, OFFSET_REG_IF - 0x200] strh r0, [r3, OFFSET_REG_IF - 0x200]
; Disable serial interrupt. @ Disable serial interrupt.
ldrh r1, [r3, OFFSET_REG_IE - 0x200] ldrh r1, [r3, OFFSET_REG_IE - 0x200]
bics r1, r0 bics r1, r0
strh r1, [r3, OFFSET_REG_IE - 0x200] strh r1, [r3, OFFSET_REG_IE - 0x200]
; Restore IME register. @ Restore IME register.
strh r2, [r3, OFFSET_REG_IME - 0x200] strh r2, [r3, OFFSET_REG_IME - 0x200]
bx lr bx lr
asm/libmks4agb.s
+113 -113
View File
@@ -1,5 +1,5 @@
thumb_func_start umul3232H32 thumb_func_start umul3232H32
umul3232H32: ; 82DF04C umul3232H32: @ 82DF04C
adr r2, _082DF050 adr r2, _082DF050
bx r2 bx r2
.arm .arm
@@ -10,7 +10,7 @@ _082DF050:
thumb_func_end umul3232H32 thumb_func_end umul3232H32
thumb_func_start SoundMain thumb_func_start SoundMain
SoundMain: ; 82DF05C SoundMain: @ 82DF05C
ldr r0, _082DF0C8 ldr r0, _082DF0C8
ldr r0, [r0] ldr r0, [r0]
ldr r2, _082DF0CC ldr r2, _082DF0CC
@@ -77,7 +77,7 @@ _082DF0DC: .4byte 0x00000630
thumb_func_end SoundMain thumb_func_end SoundMain
thumb_func_start SoundMainRAM thumb_func_start SoundMainRAM
SoundMainRAM: ; 82DF0E0 SoundMainRAM: @ 82DF0E0
ldrb r3, [r0, 0x5] ldrb r3, [r0, 0x5]
cmp r3, 0 cmp r3, 0
beq _082DF140 beq _082DF140
@@ -455,7 +455,7 @@ _082DF498: .4byte 0x68736d53
thumb_func_end SoundMainRAM thumb_func_end SoundMainRAM
arm_func_start sub_82DF49C arm_func_start sub_82DF49C
sub_82DF49C: ; 82DF49C sub_82DF49C: @ 82DF49C
ldr r6, [r4, 0x24] ldr r6, [r4, 0x24]
ldrb r0, [r4] ldrb r0, [r4]
tst r0, 0x20 tst r0, 0x20
@@ -655,7 +655,7 @@ _082DF72C:
arm_func_end sub_82DF49C arm_func_end sub_82DF49C
arm_func_start sub_82DF758 arm_func_start sub_82DF758
sub_82DF758: ; 82DF758 sub_82DF758: @ 82DF758
stmdb sp!, {r0,r2,r5-r7,lr} stmdb sp!, {r0,r2,r5-r7,lr}
mov r0, r3, lsr 6 mov r0, r3, lsr 6
ldr r1, [r4, 0x3C] ldr r1, [r4, 0x3C]
@@ -698,7 +698,7 @@ _082DF7E0: .4byte gUnknown_08675A70
arm_func_end sub_82DF758 arm_func_end sub_82DF758
thumb_func_start SoundMainBTM thumb_func_start SoundMainBTM
SoundMainBTM: ; 82DF7E4 SoundMainBTM: @ 82DF7E4
mov r12, r4 mov r12, r4
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
@@ -713,7 +713,7 @@ SoundMainBTM: ; 82DF7E4
thumb_func_end SoundMainBTM thumb_func_end SoundMainBTM
thumb_func_start ClearChain thumb_func_start ClearChain
ClearChain: ; 82DF7FC ClearChain: @ 82DF7FC
ldr r3, [r0, 0x2C] ldr r3, [r0, 0x2C]
cmp r3, 0 cmp r3, 0
beq _082DF81A beq _082DF81A
@@ -737,7 +737,7 @@ _082DF81A:
thumb_func_end ClearChain thumb_func_end ClearChain
thumb_func_start ply_fine thumb_func_start ply_fine
ply_fine: ; 82DF81C ply_fine: @ 82DF81C
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r1, 0 adds r5, r1, 0
ldr r4, [r5, 0x20] ldr r4, [r5, 0x20]
@@ -766,7 +766,7 @@ _082DF840:
thumb_func_end ply_fine thumb_func_end ply_fine
thumb_func_start MPlyJmpTblCopy thumb_func_start MPlyJmpTblCopy
MPlyJmpTblCopy: ; 82DF84C MPlyJmpTblCopy: @ 82DF84C
mov r12, lr mov r12, lr
movs r1, 0x24 movs r1, 0x24
ldr r2, _082DF87C ldr r2, _082DF87C
@@ -781,12 +781,12 @@ _082DF852:
thumb_func_end MPlyJmpTblCopy thumb_func_end MPlyJmpTblCopy
thumb_func_start ldrb_r3_r2 thumb_func_start ldrb_r3_r2
ldrb_r3_r2: ; 82DF864 ldrb_r3_r2: @ 82DF864
ldrb r3, [r2] ldrb r3, [r2]
thumb_func_end ldrb_r3_r2 thumb_func_end ldrb_r3_r2
non_word_aligned_thumb_func_start chk_adr_r2 non_word_aligned_thumb_func_start chk_adr_r2
chk_adr_r2: ; 82DF866 chk_adr_r2: @ 82DF866
push {r0} push {r0}
lsrs r0, r2, 25 lsrs r0, r2, 25
bne _082DF878 bne _082DF878
@@ -805,7 +805,7 @@ _082DF87C: .4byte gUnknown_086759E0
thumb_func_end chk_adr_r2 thumb_func_end chk_adr_r2
thumb_func_start ld_r3_tp_adr_i thumb_func_start ld_r3_tp_adr_i
ld_r3_tp_adr_i: ; 82DF880 ld_r3_tp_adr_i: @ 82DF880
ldr r2, [r1, 0x40] ldr r2, [r1, 0x40]
_082DF882: _082DF882:
adds r3, r2, 0x1 adds r3, r2, 0x1
@@ -815,7 +815,7 @@ _082DF882:
thumb_func_end ld_r3_tp_adr_i thumb_func_end ld_r3_tp_adr_i
thumb_func_start ply_goto thumb_func_start ply_goto
ply_goto: ; 82DF88C ply_goto: @ 82DF88C
push {lr} push {lr}
_082DF88E: _082DF88E:
ldr r2, [r1, 0x40] ldr r2, [r1, 0x40]
@@ -835,7 +835,7 @@ _082DF88E:
thumb_func_end ply_goto thumb_func_end ply_goto
thumb_func_start ply_patt thumb_func_start ply_patt
ply_patt: ; 82DF8AC ply_patt: @ 82DF8AC
ldrb r2, [r1, 0x2] ldrb r2, [r1, 0x2]
cmp r2, 0x3 cmp r2, 0x3
bcs _082DF8C4 bcs _082DF8C4
@@ -853,7 +853,7 @@ _082DF8C4:
thumb_func_end ply_patt thumb_func_end ply_patt
thumb_func_start play_pend thumb_func_start play_pend
play_pend: ; 82DF8C8 play_pend: @ 82DF8C8
ldrb r2, [r1, 0x2] ldrb r2, [r1, 0x2]
cmp r2, 0 cmp r2, 0
beq _082DF8DA beq _082DF8DA
@@ -868,7 +868,7 @@ _082DF8DA:
thumb_func_end play_pend thumb_func_end play_pend
thumb_func_start ply_rept thumb_func_start ply_rept
ply_rept: ; 82DF8DC ply_rept: @ 82DF8DC
push {lr} push {lr}
ldr r2, [r1, 0x40] ldr r2, [r1, 0x40]
ldrb r3, [r2] ldrb r3, [r2]
@@ -896,7 +896,7 @@ _082DF8FE:
thumb_func_end ply_rept thumb_func_end ply_rept
thumb_func_start ply_prio thumb_func_start ply_prio
ply_prio: ; 82DF90C ply_prio: @ 82DF90C
mov r12, lr mov r12, lr
bl ld_r3_tp_adr_i bl ld_r3_tp_adr_i
strb r3, [r1, 0x1D] strb r3, [r1, 0x1D]
@@ -904,7 +904,7 @@ ply_prio: ; 82DF90C
thumb_func_end ply_prio thumb_func_end ply_prio
thumb_func_start ply_tempo thumb_func_start ply_tempo
ply_tempo: ; 82DF918 ply_tempo: @ 82DF918
mov r12, lr mov r12, lr
bl ld_r3_tp_adr_i bl ld_r3_tp_adr_i
lsls r3, 1 lsls r3, 1
@@ -917,7 +917,7 @@ ply_tempo: ; 82DF918
thumb_func_end ply_tempo thumb_func_end ply_tempo
thumb_func_start ply_keysh thumb_func_start ply_keysh
ply_keysh: ; 82DF92C ply_keysh: @ 82DF92C
mov r12, lr mov r12, lr
bl ld_r3_tp_adr_i bl ld_r3_tp_adr_i
strb r3, [r1, 0xA] strb r3, [r1, 0xA]
@@ -929,7 +929,7 @@ ply_keysh: ; 82DF92C
thumb_func_end ply_keysh thumb_func_end ply_keysh
thumb_func_start ply_voice thumb_func_start ply_voice
ply_voice: ; 82DF940 ply_voice: @ 82DF940
mov r12, lr mov r12, lr
ldr r2, [r1, 0x40] ldr r2, [r1, 0x40]
ldrb r3, [r2] ldrb r3, [r2]
@@ -953,7 +953,7 @@ ply_voice: ; 82DF940
thumb_func_end ply_voice thumb_func_end ply_voice
thumb_func_start ply_vol thumb_func_start ply_vol
ply_vol: ; 82DF970 ply_vol: @ 82DF970
mov r12, lr mov r12, lr
bl ld_r3_tp_adr_i bl ld_r3_tp_adr_i
strb r3, [r1, 0x12] strb r3, [r1, 0x12]
@@ -965,7 +965,7 @@ ply_vol: ; 82DF970
thumb_func_end ply_vol thumb_func_end ply_vol
thumb_func_start ply_pan thumb_func_start ply_pan
ply_pan: ; 82DF984 ply_pan: @ 82DF984
mov r12, lr mov r12, lr
bl ld_r3_tp_adr_i bl ld_r3_tp_adr_i
subs r3, 0x40 subs r3, 0x40
@@ -978,7 +978,7 @@ ply_pan: ; 82DF984
thumb_func_end ply_pan thumb_func_end ply_pan
thumb_func_start ply_bend thumb_func_start ply_bend
ply_bend: ; 82DF998 ply_bend: @ 82DF998
mov r12, lr mov r12, lr
bl ld_r3_tp_adr_i bl ld_r3_tp_adr_i
subs r3, 0x40 subs r3, 0x40
@@ -991,7 +991,7 @@ ply_bend: ; 82DF998
thumb_func_end ply_bend thumb_func_end ply_bend
thumb_func_start ply_bendr thumb_func_start ply_bendr
ply_bendr: ; 82DF9AC ply_bendr: @ 82DF9AC
mov r12, lr mov r12, lr
bl ld_r3_tp_adr_i bl ld_r3_tp_adr_i
strb r3, [r1, 0xF] strb r3, [r1, 0xF]
@@ -1003,7 +1003,7 @@ ply_bendr: ; 82DF9AC
thumb_func_end ply_bendr thumb_func_end ply_bendr
thumb_func_start ply_lfodl thumb_func_start ply_lfodl
ply_lfodl: ; 82DF9C0 ply_lfodl: @ 82DF9C0
mov r12, lr mov r12, lr
bl ld_r3_tp_adr_i bl ld_r3_tp_adr_i
strb r3, [r1, 0x1B] strb r3, [r1, 0x1B]
@@ -1011,7 +1011,7 @@ ply_lfodl: ; 82DF9C0
thumb_func_end ply_lfodl thumb_func_end ply_lfodl
thumb_func_start ply_modt thumb_func_start ply_modt
ply_modt: ; 82DF9CC ply_modt: @ 82DF9CC
mov r12, lr mov r12, lr
bl ld_r3_tp_adr_i bl ld_r3_tp_adr_i
ldrb r0, [r1, 0x18] ldrb r0, [r1, 0x18]
@@ -1027,7 +1027,7 @@ _082DF9E2:
thumb_func_end ply_modt thumb_func_end ply_modt
thumb_func_start ply_tune thumb_func_start ply_tune
ply_tune: ; 82DF9E4 ply_tune: @ 82DF9E4
mov r12, lr mov r12, lr
bl ld_r3_tp_adr_i bl ld_r3_tp_adr_i
subs r3, 0x40 subs r3, 0x40
@@ -1040,7 +1040,7 @@ ply_tune: ; 82DF9E4
thumb_func_end ply_tune thumb_func_end ply_tune
thumb_func_start ply_port thumb_func_start ply_port
ply_port: ; 82DF9F8 ply_port: @ 82DF9F8
mov r12, lr mov r12, lr
ldr r2, [r1, 0x40] ldr r2, [r1, 0x40]
ldrb r3, [r2] ldrb r3, [r2]
@@ -1055,7 +1055,7 @@ _082DFA0C: .4byte 0x04000060
thumb_func_end ply_port thumb_func_end ply_port
thumb_func_start SoundVSync_rev01 thumb_func_start SoundVSync_rev01
SoundVSync_rev01: ; 82DFA10 SoundVSync_rev01: @ 82DFA10
ldr r0, _082DFCBC ldr r0, _082DFCBC
ldr r0, [r0] ldr r0, [r0]
ldr r2, _082DFCC0 ldr r2, _082DFCC0
@@ -1098,7 +1098,7 @@ _082DFA58: .4byte 0x84400004
thumb_func_end SoundVSync_rev01 thumb_func_end SoundVSync_rev01
thumb_func_start MPlayMain_rev01 thumb_func_start MPlayMain_rev01
MPlayMain_rev01: ; 82DFA5C MPlayMain_rev01: @ 82DFA5C
ldr r2, _082DFCC0 ldr r2, _082DFCC0
ldr r3, [r0, 0x34] ldr r3, [r0, 0x34]
cmp r2, r3 cmp r2, r3
@@ -1435,7 +1435,7 @@ _082DFCC0: .4byte 0x68736d53
thumb_func_end MPlayMain_rev01 thumb_func_end MPlayMain_rev01
thumb_func_start TrackStop_rev01 thumb_func_start TrackStop_rev01
TrackStop_rev01: ; 82DFCC4 TrackStop_rev01: @ 82DFCC4
push {r4-r6,lr} push {r4-r6,lr}
adds r5, r1, 0 adds r5, r1, 0
ldrb r1, [r5] ldrb r1, [r5]
@@ -1476,7 +1476,7 @@ _082DFD04: .4byte 0x03007ff0
thumb_func_end TrackStop_rev01 thumb_func_end TrackStop_rev01
thumb_func_start ChnVolSetAsm thumb_func_start ChnVolSetAsm
ChnVolSetAsm: ; 82DFD08 ChnVolSetAsm: @ 82DFD08
ldrb r1, [r4, 0x12] ldrb r1, [r4, 0x12]
movs r0, 0x14 movs r0, 0x14
ldrsb r2, [r4, r0] ldrsb r2, [r4, r0]
@@ -1506,7 +1506,7 @@ _082DFD34:
thumb_func_end ChnVolSetAsm thumb_func_end ChnVolSetAsm
thumb_func_start ply_note_rev01 thumb_func_start ply_note_rev01
ply_note_rev01: ; 82DFD38 ply_note_rev01: @ 82DFD38
push {r4-r7,lr} push {r4-r7,lr}
mov r4, r8 mov r4, r8
mov r5, r9 mov r5, r9
@@ -1788,7 +1788,7 @@ _082DFF38: .4byte gUnknown_08675C64
thumb_func_end ply_note_rev01 thumb_func_end ply_note_rev01
thumb_func_start ply_endtie_rev01 thumb_func_start ply_endtie_rev01
ply_endtie_rev01: ; 82DFF3C ply_endtie_rev01: @ 82DFF3C
push {r4,r5} push {r4,r5}
ldr r2, [r1, 0x40] ldr r2, [r1, 0x40]
ldrb r3, [r2] ldrb r3, [r2]
@@ -1829,7 +1829,7 @@ _082DFF78:
thumb_func_end ply_endtie_rev01 thumb_func_end ply_endtie_rev01
thumb_func_start clear_modM thumb_func_start clear_modM
clear_modM: ; 82DFF7C clear_modM: @ 82DFF7C
movs r2, 0 movs r2, 0
strb r2, [r1, 0x16] strb r2, [r1, 0x16]
strb r2, [r1, 0x1A] strb r2, [r1, 0x1A]
@@ -1848,7 +1848,7 @@ _082DFF8E:
thumb_func_end clear_modM thumb_func_end clear_modM
thumb_func_start ld_r3_tp_adr_i_rev thumb_func_start ld_r3_tp_adr_i_rev
ld_r3_tp_adr_i_rev: ; 82DFF98 ld_r3_tp_adr_i_rev: @ 82DFF98
ldr r2, [r1, 0x40] ldr r2, [r1, 0x40]
adds r3, r2, 0x1 adds r3, r2, 0x1
str r3, [r1, 0x40] str r3, [r1, 0x40]
@@ -1857,7 +1857,7 @@ ld_r3_tp_adr_i_rev: ; 82DFF98
thumb_func_end ld_r3_tp_adr_i_rev thumb_func_end ld_r3_tp_adr_i_rev
thumb_func_start ply_lfos_rev01 thumb_func_start ply_lfos_rev01
ply_lfos_rev01: ; 82DFFA4 ply_lfos_rev01: @ 82DFFA4
mov r12, lr mov r12, lr
bl ld_r3_tp_adr_i_rev bl ld_r3_tp_adr_i_rev
strb r3, [r1, 0x19] strb r3, [r1, 0x19]
@@ -1869,7 +1869,7 @@ _082DFFB4:
thumb_func_end ply_lfos_rev01 thumb_func_end ply_lfos_rev01
thumb_func_start ply_mod_rev01 thumb_func_start ply_mod_rev01
ply_mod_rev01: ; 82DFFB8 ply_mod_rev01: @ 82DFFB8
mov r12, lr mov r12, lr
bl ld_r3_tp_adr_i_rev bl ld_r3_tp_adr_i_rev
strb r3, [r1, 0x17] strb r3, [r1, 0x17]
@@ -1881,7 +1881,7 @@ _082DFFC8:
thumb_func_end ply_mod_rev01 thumb_func_end ply_mod_rev01
thumb_func_start MidiKey2fr thumb_func_start MidiKey2fr
MidiKey2fr: ; 82DFFCC MidiKey2fr: @ 82DFFCC
push {r4-r7,lr} push {r4-r7,lr}
mov r12, r0 mov r12, r0
lsls r1, 24 lsls r1, 24
@@ -1933,12 +1933,12 @@ _082E002C: .4byte gUnknown_08675B34
thumb_func_end MidiKey2fr thumb_func_end MidiKey2fr
thumb_func_start DummyFunc thumb_func_start DummyFunc
DummyFunc: ; 82E0030 DummyFunc: @ 82E0030
bx lr bx lr
thumb_func_end DummyFunc thumb_func_end DummyFunc
thumb_func_start MPlayContinue thumb_func_start MPlayContinue
MPlayContinue: ; 82E0034 MPlayContinue: @ 82E0034
adds r2, r0, 0 adds r2, r0, 0
ldr r3, [r2, 0x34] ldr r3, [r2, 0x34]
ldr r0, _082E0048 ldr r0, _082E0048
@@ -1956,8 +1956,8 @@ _082E004C: .4byte 0x7fffffff
thumb_func_end MPlayContinue thumb_func_end MPlayContinue
thumb_func_start MPlayFadeOut thumb_func_start MPlayFadeOut
; void MPlayFadeOut(mplay_table_entry *a1, s16 a2) @ void MPlayFadeOut(mplay_table_entry *a1, s16 a2)
MPlayFadeOut: ; 82E0050 MPlayFadeOut: @ 82E0050
adds r2, r0, 0 adds r2, r0, 0
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
@@ -1977,7 +1977,7 @@ _082E006C: .4byte 0x68736d53
thumb_func_end MPlayFadeOut thumb_func_end MPlayFadeOut
thumb_func_start m4aSoundInit thumb_func_start m4aSoundInit
m4aSoundInit: ; 82E0070 m4aSoundInit: @ 82E0070
push {r4-r6,lr} push {r4-r6,lr}
ldr r0, _082E00F0 ldr r0, _082E00F0
movs r1, 0x2 movs r1, 0x2
@@ -2055,7 +2055,7 @@ _082E0120: .4byte 0x03007670
thumb_func_end m4aSoundInit thumb_func_end m4aSoundInit
thumb_func_start m4aSoundMain thumb_func_start m4aSoundMain
m4aSoundMain: ; 82E0124 m4aSoundMain: @ 82E0124
push {lr} push {lr}
bl SoundMain bl SoundMain
pop {r0} pop {r0}
@@ -2063,7 +2063,7 @@ m4aSoundMain: ; 82E0124
thumb_func_end m4aSoundMain thumb_func_end m4aSoundMain
thumb_func_start m4aSongNumStart thumb_func_start m4aSongNumStart
m4aSongNumStart: ; 82E0130 m4aSongNumStart: @ 82E0130
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
ldr r2, _082E0154 ldr r2, _082E0154
@@ -2087,7 +2087,7 @@ _082E0158: .4byte gUnknown_086B49F0
thumb_func_end m4aSongNumStart thumb_func_end m4aSongNumStart
thumb_func_start m4aSongNumStartOrChange thumb_func_start m4aSongNumStartOrChange
m4aSongNumStartOrChange: ; 82E015C m4aSongNumStartOrChange: @ 82E015C
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
ldr r2, _082E0188 ldr r2, _082E0188
@@ -2128,7 +2128,7 @@ _082E01A4:
thumb_func_end m4aSongNumStartOrChange thumb_func_end m4aSongNumStartOrChange
thumb_func_start m4aSongNumStartOrContinue thumb_func_start m4aSongNumStartOrContinue
m4aSongNumStartOrContinue: ; 82E01A8 m4aSongNumStartOrContinue: @ 82E01A8
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
ldr r2, _082E01D4 ldr r2, _082E01D4
@@ -2172,7 +2172,7 @@ _082E01F8:
thumb_func_end m4aSongNumStartOrContinue thumb_func_end m4aSongNumStartOrContinue
thumb_func_start m4aSongNumStop thumb_func_start m4aSongNumStop
m4aSongNumStop: ; 82E01FC m4aSongNumStop: @ 82E01FC
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
ldr r2, _082E0228 ldr r2, _082E0228
@@ -2200,7 +2200,7 @@ _082E022C: .4byte gUnknown_086B49F0
thumb_func_end m4aSongNumStop thumb_func_end m4aSongNumStop
thumb_func_start m4aSongNumContinue thumb_func_start m4aSongNumContinue
m4aSongNumContinue: ; 82E0230 m4aSongNumContinue: @ 82E0230
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
ldr r2, _082E025C ldr r2, _082E025C
@@ -2228,7 +2228,7 @@ _082E0260: .4byte gUnknown_086B49F0
thumb_func_end m4aSongNumContinue thumb_func_end m4aSongNumContinue
thumb_func_start m4aMPlayAllStop thumb_func_start m4aMPlayAllStop
m4aMPlayAllStop: ; 82E0264 m4aMPlayAllStop: @ 82E0264
push {r4,r5,lr} push {r4,r5,lr}
ldr r0, _082E029C ldr r0, _082E029C
lsls r0, 16 lsls r0, 16
@@ -2264,7 +2264,7 @@ _082E02A4: .4byte 0x030073a0
thumb_func_end m4aMPlayAllStop thumb_func_end m4aMPlayAllStop
thumb_func_start m4aMPlayContinue thumb_func_start m4aMPlayContinue
m4aMPlayContinue: ; 82E02A8 m4aMPlayContinue: @ 82E02A8
push {lr} push {lr}
bl MPlayContinue bl MPlayContinue
pop {r0} pop {r0}
@@ -2272,7 +2272,7 @@ m4aMPlayContinue: ; 82E02A8
thumb_func_end m4aMPlayContinue thumb_func_end m4aMPlayContinue
thumb_func_start m4aMPlayAllContinue thumb_func_start m4aMPlayAllContinue
m4aMPlayAllContinue: ; 82E02B2 m4aMPlayAllContinue: @ 82E02B2
push {r4,r5,lr} push {r4,r5,lr}
ldr r0, _082E02EC ldr r0, _082E02EC
lsls r0, 16 lsls r0, 16
@@ -2308,8 +2308,8 @@ _082E02F4: .4byte 0x030073a0
thumb_func_end m4aMPlayAllContinue thumb_func_end m4aMPlayAllContinue
thumb_func_start m4aMPlayFadeOut thumb_func_start m4aMPlayFadeOut
; void m4aMPlayFadeOut(mplay_table_entry *a1, u16 a2) @ void m4aMPlayFadeOut(mplay_table_entry *a1, u16 a2)
m4aMPlayFadeOut: ; 82E02F8 m4aMPlayFadeOut: @ 82E02F8
push {lr} push {lr}
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
@@ -2319,7 +2319,7 @@ m4aMPlayFadeOut: ; 82E02F8
thumb_func_end m4aMPlayFadeOut thumb_func_end m4aMPlayFadeOut
thumb_func_start sub_82E0308 thumb_func_start sub_82E0308
sub_82E0308: ; 82E0308 sub_82E0308: @ 82E0308
adds r2, r0, 0 adds r2, r0, 0
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
@@ -2339,7 +2339,7 @@ _082E0324: .4byte 0x00000101
thumb_func_end sub_82E0308 thumb_func_end sub_82E0308
thumb_func_start sub_82E0328 thumb_func_start sub_82E0328
sub_82E0328: ; 82E0328 sub_82E0328: @ 82E0328
adds r2, r0, 0 adds r2, r0, 0
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
@@ -2363,7 +2363,7 @@ _082E034C: .4byte 0x7fffffff
thumb_func_end sub_82E0328 thumb_func_end sub_82E0328
thumb_func_start m4aMPlayImmInit thumb_func_start m4aMPlayImmInit
m4aMPlayImmInit: ; 82E0350 m4aMPlayImmInit: @ 82E0350
push {r4-r7,lr} push {r4-r7,lr}
ldrb r5, [r0, 0x8] ldrb r5, [r0, 0x8]
ldr r4, [r0, 0x2C] ldr r4, [r0, 0x2C]
@@ -2405,8 +2405,8 @@ _082E0392:
thumb_func_end m4aMPlayImmInit thumb_func_end m4aMPlayImmInit
thumb_func_start MPlayExtender thumb_func_start MPlayExtender
; int MPlayExtender(void *dest) @ int MPlayExtender(void *dest)
MPlayExtender: ; 82E0398 MPlayExtender: @ 82E0398
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x4 sub sp, 0x4
adds r5, r0, 0 adds r5, r0, 0
@@ -2531,13 +2531,13 @@ _082E04AC: .4byte 0x05000040
thumb_func_end MPlayExtender thumb_func_end MPlayExtender
thumb_func_start MusicPlayerJumpTableCopy thumb_func_start MusicPlayerJumpTableCopy
MusicPlayerJumpTableCopy: ; 82E04B0 MusicPlayerJumpTableCopy: @ 82E04B0
swi 0x2A swi 0x2A
bx lr bx lr
thumb_func_end MusicPlayerJumpTableCopy thumb_func_end MusicPlayerJumpTableCopy
thumb_func_start ClearChain_rev thumb_func_start ClearChain_rev
ClearChain_rev: ; 82E04B4 ClearChain_rev: @ 82E04B4
push {lr} push {lr}
ldr r1, _082E04C4 ldr r1, _082E04C4
ldr r1, [r1] ldr r1, [r1]
@@ -2549,7 +2549,7 @@ _082E04C4: .4byte 0x030074e8
thumb_func_end ClearChain_rev thumb_func_end ClearChain_rev
thumb_func_start Clear64byte_rev thumb_func_start Clear64byte_rev
Clear64byte_rev: ; 82E04C8 Clear64byte_rev: @ 82E04C8
push {lr} push {lr}
ldr r1, _082E04D8 ldr r1, _082E04D8
ldr r1, [r1] ldr r1, [r1]
@@ -2561,8 +2561,8 @@ _082E04D8: .4byte 0x030074ec
thumb_func_end Clear64byte_rev thumb_func_end Clear64byte_rev
thumb_func_start SoundInit_rev01 thumb_func_start SoundInit_rev01
; int SoundInit_rev01(void *dest) @ int SoundInit_rev01(void *dest)
SoundInit_rev01: ; 82E04DC SoundInit_rev01: @ 82E04DC
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x4 sub sp, 0x4
adds r5, r0, 0 adds r5, r0, 0
@@ -2674,7 +2674,7 @@ _082E05D0: .4byte 0x68736d53
thumb_func_end SoundInit_rev01 thumb_func_end SoundInit_rev01
thumb_func_start SampFreqSet_rev01 thumb_func_start SampFreqSet_rev01
SampFreqSet_rev01: ; 82E05D4 SampFreqSet_rev01: @ 82E05D4
push {r4-r6,lr} push {r4-r6,lr}
adds r2, r0, 0 adds r2, r0, 0
ldr r0, _082E0654 ldr r0, _082E0654
@@ -2748,7 +2748,7 @@ _082E0674: .4byte 0x04000006
thumb_func_end SampFreqSet_rev01 thumb_func_end SampFreqSet_rev01
thumb_func_start SoundMode_rev01 thumb_func_start SoundMode_rev01
SoundMode_rev01: ; 82E0678 SoundMode_rev01: @ 82E0678
push {r4,r5,lr} push {r4,r5,lr}
adds r3, r0, 0 adds r3, r0, 0
ldr r0, _082E0704 ldr r0, _082E0704
@@ -2831,7 +2831,7 @@ _082E070C: .4byte 0x04000089
thumb_func_end SoundMode_rev01 thumb_func_end SoundMode_rev01
thumb_func_start SoundClear_rev01 thumb_func_start SoundClear_rev01
SoundClear_rev01: ; 82E0710 SoundClear_rev01: @ 82E0710
push {r4-r7,lr} push {r4-r7,lr}
ldr r0, _082E075C ldr r0, _082E075C
ldr r6, [r0] ldr r6, [r0]
@@ -2879,7 +2879,7 @@ _082E0760: .4byte 0x68736d53
thumb_func_end SoundClear_rev01 thumb_func_end SoundClear_rev01
thumb_func_start SoundVSyncOff_rev01 thumb_func_start SoundVSyncOff_rev01
SoundVSyncOff_rev01: ; 82E0764 SoundVSyncOff_rev01: @ 82E0764
push {lr} push {lr}
sub sp, 0x4 sub sp, 0x4
ldr r0, _082E07C4 ldr r0, _082E07C4
@@ -2940,7 +2940,7 @@ _082E07DC: .4byte 0x05000318
thumb_func_end SoundVSyncOff_rev01 thumb_func_end SoundVSyncOff_rev01
thumb_func_start SoundVSyncOn_rev01 thumb_func_start SoundVSyncOn_rev01
SoundVSyncOn_rev01: ; 82E07E0 SoundVSyncOn_rev01: @ 82E07E0
push {r4,lr} push {r4,lr}
ldr r0, _082E0810 ldr r0, _082E0810
ldr r2, [r0] ldr r2, [r0]
@@ -2972,7 +2972,7 @@ _082E0818: .4byte 0x040000c6
thumb_func_end SoundVSyncOn_rev01 thumb_func_end SoundVSyncOn_rev01
thumb_func_start MPlayOpen_rev01 thumb_func_start MPlayOpen_rev01
MPlayOpen_rev01: ; 82E081C MPlayOpen_rev01: @ 82E081C
push {r4-r7,lr} push {r4-r7,lr}
adds r7, r0, 0 adds r7, r0, 0
adds r6, r1, 0 adds r6, r1, 0
@@ -3037,7 +3037,7 @@ _082E0890: .4byte MPlayMain_rev01
thumb_func_end MPlayOpen_rev01 thumb_func_end MPlayOpen_rev01
thumb_func_start MPlayStart_rev01 thumb_func_start MPlayStart_rev01
MPlayStart_rev01: ; 82E0894 MPlayStart_rev01: @ 82E0894
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -3161,7 +3161,7 @@ _082E0974: .4byte 0x68736d53
thumb_func_end MPlayStart_rev01 thumb_func_end MPlayStart_rev01
thumb_func_start MPlayStop_rev01 thumb_func_start MPlayStop_rev01
MPlayStop_rev01: ; 82E0978 MPlayStop_rev01: @ 82E0978
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r0, 0 adds r6, r0, 0
ldr r1, [r6, 0x34] ldr r1, [r6, 0x34]
@@ -3199,7 +3199,7 @@ _082E09B4: .4byte 0x68736d53
thumb_func_end MPlayStop_rev01 thumb_func_end MPlayStop_rev01
thumb_func_start FadeOutBody_rev01 thumb_func_start FadeOutBody_rev01
FadeOutBody_rev01: ; 82E09B8 FadeOutBody_rev01: @ 82E09B8
push {r4-r7,lr} push {r4-r7,lr}
adds r6, r0, 0 adds r6, r0, 0
ldrh r1, [r6, 0x24] ldrh r1, [r6, 0x24]
@@ -3311,7 +3311,7 @@ _082E0A7A:
thumb_func_end FadeOutBody_rev01 thumb_func_end FadeOutBody_rev01
thumb_func_start TrkVolPitSet_rev01 thumb_func_start TrkVolPitSet_rev01
TrkVolPitSet_rev01: ; 82E0A80 TrkVolPitSet_rev01: @ 82E0A80
push {r4,lr} push {r4,lr}
adds r2, r1, 0 adds r2, r1, 0
movs r0, 0x1 movs r0, 0x1
@@ -3412,7 +3412,7 @@ _082E0B28:
thumb_func_end TrkVolPitSet_rev01 thumb_func_end TrkVolPitSet_rev01
thumb_func_start MidiKey2CgbFr thumb_func_start MidiKey2CgbFr
MidiKey2CgbFr: ; 82E0B34 MidiKey2CgbFr: @ 82E0B34
push {r4-r7,lr} push {r4-r7,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -3504,7 +3504,7 @@ _082E0BD8: .4byte gUnknown_08675C00
thumb_func_end MidiKey2CgbFr thumb_func_end MidiKey2CgbFr
thumb_func_start CgbOscOff thumb_func_start CgbOscOff
CgbOscOff: ; 82E0BDC CgbOscOff: @ 82E0BDC
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r1, r0, 0 adds r1, r0, 0
@@ -3554,7 +3554,7 @@ _082E0C28: .4byte 0x04000079
thumb_func_end CgbOscOff thumb_func_end CgbOscOff
thumb_func_start CgbModVol thumb_func_start CgbModVol
CgbModVol: ; 82E0C2C CgbModVol: @ 82E0C2C
push {r4,lr} push {r4,lr}
adds r2, r0, 0 adds r2, r0, 0
ldr r0, _082E0C5C ldr r0, _082E0C5C
@@ -3624,7 +3624,7 @@ _082E0C8C:
thumb_func_end CgbModVol thumb_func_end CgbModVol
thumb_func_start CgbSound thumb_func_start CgbSound
CgbSound: ; 82E0CA8 CgbSound: @ 82E0CA8
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -4208,7 +4208,7 @@ _082E10E2:
thumb_func_end CgbSound thumb_func_end CgbSound
thumb_func_start MPlayTempoControl thumb_func_start MPlayTempoControl
MPlayTempoControl: ; 82E10F4 MPlayTempoControl: @ 82E10F4
push {r4,lr} push {r4,lr}
adds r2, r0, 0 adds r2, r0, 0
lsls r1, 16 lsls r1, 16
@@ -4232,7 +4232,7 @@ _082E1118: .4byte 0x68736d53
thumb_func_end MPlayTempoControl thumb_func_end MPlayTempoControl
thumb_func_start MPlayVolumeControl thumb_func_start MPlayVolumeControl
MPlayVolumeControl: ; 82E111C MPlayVolumeControl: @ 82E111C
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r9 mov r7, r9
mov r6, r8 mov r6, r8
@@ -4292,7 +4292,7 @@ _082E1180: .4byte 0x68736d53
thumb_func_end MPlayVolumeControl thumb_func_end MPlayVolumeControl
thumb_func_start MPlayPitchControl thumb_func_start MPlayPitchControl
MPlayPitchControl: ; 82E1184 MPlayPitchControl: @ 82E1184
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -4358,7 +4358,7 @@ _082E11F4: .4byte 0x68736d53
thumb_func_end MPlayPitchControl thumb_func_end MPlayPitchControl
thumb_func_start MPlayPanpotControl thumb_func_start MPlayPanpotControl
MPlayPanpotControl: ; 82E11F8 MPlayPanpotControl: @ 82E11F8
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r9 mov r7, r9
mov r6, r8 mov r6, r8
@@ -4418,7 +4418,7 @@ _082E125C: .4byte 0x68736d53
thumb_func_end MPlayPanpotControl thumb_func_end MPlayPanpotControl
thumb_func_start MP_clear_modM thumb_func_start MP_clear_modM
MP_clear_modM: ; 82E1260 MP_clear_modM: @ 82E1260
adds r1, r0, 0 adds r1, r0, 0
movs r2, 0 movs r2, 0
movs r0, 0 movs r0, 0
@@ -4439,7 +4439,7 @@ _082E1276:
thumb_func_end MP_clear_modM thumb_func_end MP_clear_modM
thumb_func_start MPlayModDepthSet thumb_func_start MPlayModDepthSet
MPlayModDepthSet: ; 82E1280 MPlayModDepthSet: @ 82E1280
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -4503,7 +4503,7 @@ _082E12F0: .4byte 0x68736d53
thumb_func_end MPlayModDepthSet thumb_func_end MPlayModDepthSet
thumb_func_start MPlayLFOSpeedSet thumb_func_start MPlayLFOSpeedSet
MPlayLFOSpeedSet: ; 82E12F4 MPlayLFOSpeedSet: @ 82E12F4
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -4567,7 +4567,7 @@ _082E1364: .4byte 0x68736d53
thumb_func_end MPlayLFOSpeedSet thumb_func_end MPlayLFOSpeedSet
thumb_func_start ply_memacc thumb_func_start ply_memacc
ply_memacc: ; 82E1368 ply_memacc: @ 82E1368
push {r4-r6,lr} push {r4-r6,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r6, r1, 0 adds r6, r1, 0
@@ -4746,7 +4746,7 @@ _082E14BA:
thumb_func_end ply_memacc thumb_func_end ply_memacc
thumb_func_start ply_xcmd thumb_func_start ply_xcmd
ply_xcmd: ; 82E14C0 ply_xcmd: @ 82E14C0
push {lr} push {lr}
ldr r2, [r1, 0x40] ldr r2, [r1, 0x40]
ldrb r3, [r2] ldrb r3, [r2]
@@ -4764,7 +4764,7 @@ _082E14DC: .4byte gUnknown_08675CCC
thumb_func_end ply_xcmd thumb_func_end ply_xcmd
thumb_func_start ply_xxx thumb_func_start ply_xxx
ply_xxx: ; 82E14E0 ply_xxx: @ 82E14E0
push {lr} push {lr}
ldr r2, _082E14F0 ldr r2, _082E14F0
ldr r2, [r2] ldr r2, [r2]
@@ -4776,7 +4776,7 @@ _082E14F0: .4byte 0x03007460
thumb_func_end ply_xxx thumb_func_end ply_xxx
thumb_func_start ply_xwave thumb_func_start ply_xwave
ply_xwave: ; 82E14F4 ply_xwave: @ 82E14F4
push {r4,lr} push {r4,lr}
ldr r2, [r1, 0x40] ldr r2, [r1, 0x40]
ldr r0, _082E152C ldr r0, _082E152C
@@ -4812,7 +4812,7 @@ _082E1538: .4byte 0x00ffffff
thumb_func_end ply_xwave thumb_func_end ply_xwave
thumb_func_start ply_xtype thumb_func_start ply_xtype
ply_xtype: ; 82E153C ply_xtype: @ 82E153C
ldr r0, [r1, 0x40] ldr r0, [r1, 0x40]
ldrb r2, [r0] ldrb r2, [r0]
adds r0, r1, 0 adds r0, r1, 0
@@ -4825,7 +4825,7 @@ ply_xtype: ; 82E153C
thumb_func_end ply_xtype thumb_func_end ply_xtype
thumb_func_start ply_xatta thumb_func_start ply_xatta
ply_xatta: ; 82E1550 ply_xatta: @ 82E1550
ldr r0, [r1, 0x40] ldr r0, [r1, 0x40]
ldrb r2, [r0] ldrb r2, [r0]
adds r0, r1, 0 adds r0, r1, 0
@@ -4838,7 +4838,7 @@ ply_xatta: ; 82E1550
thumb_func_end ply_xatta thumb_func_end ply_xatta
thumb_func_start ply_xdeca thumb_func_start ply_xdeca
ply_xdeca: ; 82E1564 ply_xdeca: @ 82E1564
ldr r0, [r1, 0x40] ldr r0, [r1, 0x40]
ldrb r0, [r0] ldrb r0, [r0]
adds r2, r1, 0 adds r2, r1, 0
@@ -4851,7 +4851,7 @@ ply_xdeca: ; 82E1564
thumb_func_end ply_xdeca thumb_func_end ply_xdeca
thumb_func_start ply_xsust thumb_func_start ply_xsust
ply_xsust: ; 82E1578 ply_xsust: @ 82E1578
ldr r0, [r1, 0x40] ldr r0, [r1, 0x40]
ldrb r0, [r0] ldrb r0, [r0]
adds r2, r1, 0 adds r2, r1, 0
@@ -4864,7 +4864,7 @@ ply_xsust: ; 82E1578
thumb_func_end ply_xsust thumb_func_end ply_xsust
thumb_func_start ply_xrele thumb_func_start ply_xrele
ply_xrele: ; 82E158C ply_xrele: @ 82E158C
ldr r0, [r1, 0x40] ldr r0, [r1, 0x40]
ldrb r0, [r0] ldrb r0, [r0]
adds r2, r1, 0 adds r2, r1, 0
@@ -4877,7 +4877,7 @@ ply_xrele: ; 82E158C
thumb_func_end ply_xrele thumb_func_end ply_xrele
thumb_func_start ply_xiecv thumb_func_start ply_xiecv
ply_xiecv: ; 82E15A0 ply_xiecv: @ 82E15A0
ldr r0, [r1, 0x40] ldr r0, [r1, 0x40]
ldrb r2, [r0] ldrb r2, [r0]
strb r2, [r1, 0x1E] strb r2, [r1, 0x1E]
@@ -4887,7 +4887,7 @@ ply_xiecv: ; 82E15A0
thumb_func_end ply_xiecv thumb_func_end ply_xiecv
thumb_func_start ply_xiecl thumb_func_start ply_xiecl
ply_xiecl: ; 82E15AC ply_xiecl: @ 82E15AC
ldr r0, [r1, 0x40] ldr r0, [r1, 0x40]
ldrb r2, [r0] ldrb r2, [r0]
strb r2, [r1, 0x1F] strb r2, [r1, 0x1F]
@@ -4897,7 +4897,7 @@ ply_xiecl: ; 82E15AC
thumb_func_end ply_xiecl thumb_func_end ply_xiecl
thumb_func_start ply_xleng thumb_func_start ply_xleng
ply_xleng: ; 82E15B8 ply_xleng: @ 82E15B8
ldr r0, [r1, 0x40] ldr r0, [r1, 0x40]
ldrb r0, [r0] ldrb r0, [r0]
adds r2, r1, 0 adds r2, r1, 0
@@ -4910,7 +4910,7 @@ ply_xleng: ; 82E15B8
thumb_func_end ply_xleng thumb_func_end ply_xleng
thumb_func_start ply_xswee thumb_func_start ply_xswee
ply_xswee: ; 82E15CC ply_xswee: @ 82E15CC
ldr r0, [r1, 0x40] ldr r0, [r1, 0x40]
ldrb r0, [r0] ldrb r0, [r0]
adds r2, r1, 0 adds r2, r1, 0
@@ -4923,7 +4923,7 @@ ply_xswee: ; 82E15CC
thumb_func_end ply_xswee thumb_func_end ply_xswee
thumb_func_start ply_xcmd0C thumb_func_start ply_xcmd0C
ply_xcmd0C: ; 82E15E0 ply_xcmd0C: @ 82E15E0
push {r4,lr} push {r4,lr}
adds r3, r1, 0 adds r3, r1, 0
ldr r4, [r3, 0x40] ldr r4, [r3, 0x40]
@@ -4963,7 +4963,7 @@ _082E1620:
thumb_func_end ply_xcmd0C thumb_func_end ply_xcmd0C
thumb_func_start ply_xcmd0D thumb_func_start ply_xcmd0D
ply_xcmd0D: ; 82E1628 ply_xcmd0D: @ 82E1628
push {r4,lr} push {r4,lr}
ldr r2, [r1, 0x40] ldr r2, [r1, 0x40]
ldr r0, _082E1660 ldr r0, _082E1660
@@ -4999,12 +4999,12 @@ _082E166C: .4byte 0x00ffffff
thumb_func_end ply_xcmd0D thumb_func_end ply_xcmd0D
thumb_func_start DummyFunc_rev thumb_func_start DummyFunc_rev
DummyFunc_rev: ; 82E1670 DummyFunc_rev: @ 82E1670
bx lr bx lr
thumb_func_end DummyFunc_rev thumb_func_end DummyFunc_rev
thumb_func_start sub_82E1674 thumb_func_start sub_82E1674
sub_82E1674: ; 82E1674 sub_82E1674: @ 82E1674
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -5109,7 +5109,7 @@ _082E1740: .4byte 0x68736d53
thumb_func_end sub_82E1674 thumb_func_end sub_82E1674
thumb_func_start sub_82E1744 thumb_func_start sub_82E1744
sub_82E1744: ; 82E1744 sub_82E1744: @ 82E1744
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, _082E1754 ldr r2, _082E1754
@@ -5122,7 +5122,7 @@ _082E1754: .4byte 0x030077b0
thumb_func_end sub_82E1744 thumb_func_end sub_82E1744
thumb_func_start sub_82E1758 thumb_func_start sub_82E1758
sub_82E1758: ; 82E1758 sub_82E1758: @ 82E1758
ldr r2, _082E176C ldr r2, _082E176C
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
@@ -5137,7 +5137,7 @@ _082E176C: .4byte 0x030077b0
thumb_func_end sub_82E1758 thumb_func_end sub_82E1758
thumb_func_start sub_82E1770 thumb_func_start sub_82E1770
sub_82E1770: ; 82E1770 sub_82E1770: @ 82E1770
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 16 lsls r0, 16
ldr r3, _082E17A4 ldr r3, _082E17A4
@@ -5169,7 +5169,7 @@ _082E17A4: .4byte 0x030077b0
thumb_func_end sub_82E1770 thumb_func_end sub_82E1770
thumb_func_start sub_82E17A8 thumb_func_start sub_82E17A8
sub_82E17A8: ; 82E17A8 sub_82E17A8: @ 82E17A8
ldr r1, _082E17B0 ldr r1, _082E17B0
strh r0, [r1, 0x2E] strh r0, [r1, 0x2E]
bx lr bx lr
@@ -5178,7 +5178,7 @@ _082E17B0: .4byte 0x030077b0
thumb_func_end sub_82E17A8 thumb_func_end sub_82E17A8
thumb_func_start sub_82E17B4 thumb_func_start sub_82E17B4
sub_82E17B4: ; 82E17B4 sub_82E17B4: @ 82E17B4
ldr r1, _082E17BC ldr r1, _082E17BC
adds r1, 0x26 adds r1, 0x26
strb r0, [r1] strb r0, [r1]
@@ -5188,7 +5188,7 @@ _082E17BC: .4byte 0x030077b0
thumb_func_end sub_82E17B4 thumb_func_end sub_82E17B4
thumb_func_start sub_82E17C0 thumb_func_start sub_82E17C0
sub_82E17C0: ; 82E17C0 sub_82E17C0: @ 82E17C0
ldr r1, _082E17C8 ldr r1, _082E17C8
str r0, [r1, 0x20] str r0, [r1, 0x20]
bx lr bx lr
@@ -5197,7 +5197,7 @@ _082E17C8: .4byte 0x030077b0
thumb_func_end sub_82E17C0 thumb_func_end sub_82E17C0
thumb_func_start sub_82E17CC thumb_func_start sub_82E17CC
sub_82E17CC: ; 82E17CC sub_82E17CC: @ 82E17CC
ldr r1, [r0, 0x2C] ldr r1, [r0, 0x2C]
ldr r0, [r1, 0x20] ldr r0, [r1, 0x20]
cmp r0, 0 cmp r0, 0
@@ -5214,7 +5214,7 @@ _082E17E0:
thumb_func_end sub_82E17CC thumb_func_end sub_82E17CC
thumb_func_start sub_82E17E4 thumb_func_start sub_82E17E4
sub_82E17E4: ; 82E17E4 sub_82E17E4: @ 82E17E4
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r0, 0 cmp r0, 0
@@ -5241,7 +5241,7 @@ _082E180C: .4byte 0x030077b0
thumb_func_end sub_82E17E4 thumb_func_end sub_82E17E4
thumb_func_start sub_82E1810 thumb_func_start sub_82E1810
sub_82E1810: ; 82E1810 sub_82E1810: @ 82E1810
ldr r1, _082E1828 ldr r1, _082E1828
ldr r2, [r1] ldr r2, [r1]
cmp r0, 0 cmp r0, 0
@@ -5275,7 +5275,7 @@ _082E184C: .4byte 0x00003302
thumb_func_end sub_82E1810 thumb_func_end sub_82E1810
thumb_func_start sub_82E1850 thumb_func_start sub_82E1850
sub_82E1850: ; 82E1850 sub_82E1850: @ 82E1850
ldr r1, _082E1858 ldr r1, _082E1858
strb r0, [r1, 0x2] strb r0, [r1, 0x2]
bx lr bx lr
asm/librfu.s
+151 -151
View File
File diff suppressed because it is too large Load Diff
asm/librtc.s
+32 -32
View File
@@ -1,6 +1,6 @@
thumb_func_start RTC_SetReadWrite thumb_func_start RTC_SetReadWrite
; void RTC_SetReadWrite() @ void RTC_SetReadWrite()
RTC_SetReadWrite: ; 82E2150 RTC_SetReadWrite: @ 82E2150
push {r7,lr} push {r7,lr}
mov r7, sp mov r7, sp
bl RTC_SetReadWriteInternal bl RTC_SetReadWriteInternal
@@ -14,8 +14,8 @@ RTC_SetReadWrite: ; 82E2150
thumb_func_end RTC_SetReadWrite thumb_func_end RTC_SetReadWrite
thumb_func_start RTC_SetReadOnly thumb_func_start RTC_SetReadOnly
; void RTC_SetReadOnly() @ void RTC_SetReadOnly()
RTC_SetReadOnly: ; 82E2168 RTC_SetReadOnly: @ 82E2168
push {r7,lr} push {r7,lr}
mov r7, sp mov r7, sp
bl RTC_SetReadOnlyInternal bl RTC_SetReadOnlyInternal
@@ -29,8 +29,8 @@ RTC_SetReadOnly: ; 82E2168
thumb_func_end RTC_SetReadOnly thumb_func_end RTC_SetReadOnly
thumb_func_start RTC_Init thumb_func_start RTC_Init
; u8 RTC_Init() @ u8 RTC_Init()
RTC_Init: ; 82E2180 RTC_Init: @ 82E2180
push {r7,lr} push {r7,lr}
sub sp, 0x10 sub sp, 0x10
mov r7, sp mov r7, sp
@@ -144,8 +144,8 @@ _082E224E:
thumb_func_end RTC_Init thumb_func_end RTC_Init
thumb_func_start RTC_Reset thumb_func_start RTC_Reset
; u8 RTC_Reset() @ u8 RTC_Reset()
RTC_Reset: ; 82E2258 RTC_Reset: @ 82E2258
push {r7,lr} push {r7,lr}
sub sp, 0x10 sub sp, 0x10
mov r7, sp mov r7, sp
@@ -208,8 +208,8 @@ _082E22D4:
thumb_func_end RTC_Reset thumb_func_end RTC_Reset
thumb_func_start RTC_GetControlReg thumb_func_start RTC_GetControlReg
; u8 RTC_GetControlReg(struct RTCInfo *rtc) @ u8 RTC_GetControlReg(struct RTCInfo *rtc)
RTC_GetControlReg: ; 82E22DC RTC_GetControlReg: @ 82E22DC
push {r4,r7,lr} push {r4,r7,lr}
sub sp, 0x8 sub sp, 0x8
mov r7, sp mov r7, sp
@@ -309,8 +309,8 @@ _082E23A0:
thumb_func_end RTC_GetControlReg thumb_func_end RTC_GetControlReg
thumb_func_start RTC_SetControlReg thumb_func_start RTC_SetControlReg
; u8 RTC_SetControlReg(struct RTCInfo *rtc) @ u8 RTC_SetControlReg(struct RTCInfo *rtc)
RTC_SetControlReg: ; 82E23A8 RTC_SetControlReg: @ 82E23A8
push {r4,r7,lr} push {r4,r7,lr}
sub sp, 0x8 sub sp, 0x8
mov r7, sp mov r7, sp
@@ -391,8 +391,8 @@ _082E2448:
thumb_func_end RTC_SetControlReg thumb_func_end RTC_SetControlReg
thumb_func_start RTC_GetDateTime thumb_func_start RTC_GetDateTime
; u8 RTC_GetDateTime(u8 *rtcDateTime) @ u8 RTC_GetDateTime(u8 *rtcDateTime)
RTC_GetDateTime: ; 82E2450 RTC_GetDateTime: @ 82E2450
push {r7,lr} push {r7,lr}
sub sp, 0x8 sub sp, 0x8
mov r7, sp mov r7, sp
@@ -478,8 +478,8 @@ _082E24F8:
thumb_func_end RTC_GetDateTime thumb_func_end RTC_GetDateTime
thumb_func_start RTC_SetDateTime thumb_func_start RTC_SetDateTime
; u8 RTC_SetDateTime(u8 *rtcDateTime) @ u8 RTC_SetDateTime(u8 *rtcDateTime)
RTC_SetDateTime: ; 82E2500 RTC_SetDateTime: @ 82E2500
push {r7,lr} push {r7,lr}
sub sp, 0x8 sub sp, 0x8
mov r7, sp mov r7, sp
@@ -553,8 +553,8 @@ _082E2594:
thumb_func_end RTC_SetDateTime thumb_func_end RTC_SetDateTime
thumb_func_start RTC_GetTime thumb_func_start RTC_GetTime
; u8 RTC_GetTime(u8 *rtcTime) @ u8 RTC_GetTime(u8 *rtcTime)
RTC_GetTime: ; 82E259C RTC_GetTime: @ 82E259C
push {r7,lr} push {r7,lr}
sub sp, 0x8 sub sp, 0x8
mov r7, sp mov r7, sp
@@ -641,8 +641,8 @@ _082E2648:
thumb_func_end RTC_GetTime thumb_func_end RTC_GetTime
thumb_func_start RTC_SetTime thumb_func_start RTC_SetTime
; u8 RTC_SetTime(u8 *rtcTime) @ u8 RTC_SetTime(u8 *rtcTime)
RTC_SetTime: ; 82E2650 RTC_SetTime: @ 82E2650
push {r7,lr} push {r7,lr}
sub sp, 0x8 sub sp, 0x8
mov r7, sp mov r7, sp
@@ -717,8 +717,8 @@ _082E26E4:
thumb_func_end RTC_SetTime thumb_func_end RTC_SetTime
thumb_func_start RTC_SetUnknownData thumb_func_start RTC_SetUnknownData
; u8 RTC_SetUnknownData(struct RTCInfo *rtc) @ u8 RTC_SetUnknownData(struct RTCInfo *rtc)
RTC_SetUnknownData: ; 82E26EC RTC_SetUnknownData: @ 82E26EC
push {r4,r7,lr} push {r4,r7,lr}
sub sp, 0xC sub sp, 0xC
mov r7, sp mov r7, sp
@@ -871,8 +871,8 @@ _082E2818:
thumb_func_end RTC_SetUnknownData thumb_func_end RTC_SetUnknownData
thumb_func_start RTC_WriteByte thumb_func_start RTC_WriteByte
; u8 RTC_WriteByte(u8 value) @ u8 RTC_WriteByte(u8 value)
RTC_WriteByte: ; 82E2820 RTC_WriteByte: @ 82E2820
push {r4,r5,r7,lr} push {r4,r5,r7,lr}
sub sp, 0x4 sub sp, 0x4
mov r7, sp mov r7, sp
@@ -960,8 +960,8 @@ _082E28BC:
thumb_func_end RTC_WriteByte thumb_func_end RTC_WriteByte
thumb_func_start RTC_WriteByteReversed thumb_func_start RTC_WriteByteReversed
; u8 RTC_WriteByteReversed(u8 value) @ u8 RTC_WriteByteReversed(u8 value)
RTC_WriteByteReversed: ; 82E28C4 RTC_WriteByteReversed: @ 82E28C4
push {r4,r7,lr} push {r4,r7,lr}
sub sp, 0x4 sub sp, 0x4
mov r7, sp mov r7, sp
@@ -1047,8 +1047,8 @@ _082E295C:
thumb_func_end RTC_WriteByteReversed thumb_func_end RTC_WriteByteReversed
thumb_func_start RTC_ReadByte thumb_func_start RTC_ReadByte
; u8 RTC_ReadByte() @ u8 RTC_ReadByte()
RTC_ReadByte: ; 82E2964 RTC_ReadByte: @ 82E2964
push {r7,lr} push {r7,lr}
sub sp, 0x4 sub sp, 0x4
mov r7, sp mov r7, sp
@@ -1124,8 +1124,8 @@ _082E29E8:
thumb_func_end RTC_ReadByte thumb_func_end RTC_ReadByte
thumb_func_start RTC_SetReadWriteInternal thumb_func_start RTC_SetReadWriteInternal
; void RTC_SetReadWriteInternal() @ void RTC_SetReadWriteInternal()
RTC_SetReadWriteInternal: ; 82E29F0 RTC_SetReadWriteInternal: @ 82E29F0
push {r7,lr} push {r7,lr}
mov r7, sp mov r7, sp
ldr r0, =GPIOPortReadWrite ldr r0, =GPIOPortReadWrite
@@ -1138,8 +1138,8 @@ RTC_SetReadWriteInternal: ; 82E29F0
thumb_func_end RTC_SetReadWriteInternal thumb_func_end RTC_SetReadWriteInternal
thumb_func_start RTC_SetReadOnlyInternal thumb_func_start RTC_SetReadOnlyInternal
; void RTC_SetReadOnlyInternal() @ void RTC_SetReadOnlyInternal()
RTC_SetReadOnlyInternal: ; 82E2A04 RTC_SetReadOnlyInternal: @ 82E2A04
push {r7,lr} push {r7,lr}
mov r7, sp mov r7, sp
ldr r0, =GPIOPortReadWrite ldr r0, =GPIOPortReadWrite
asm/macros.s
+12 -12
View File
@@ -23,16 +23,16 @@
.macro obj_pal address, tag .macro obj_pal address, tag
.4byte \address .4byte \address
.2byte \tag .2byte \tag
.2byte 0; padding .2byte 0@ padding
.endm .endm
.macro zero_fill count .macro zero_fill count
.fill \count .fill \count
.endm .endm
; Berry trees have a table defining the palette slot used for each of their 5 @ Berry trees have a table defining the palette slot used for each of their 5
; stages. However, the first 2 stages always use the same slots regardless of @ stages. However, the first 2 stages always use the same slots regardless of
; the type of tree and the slots of the last 3 stages always equal each other. @ the type of tree and the slots of the last 3 stages always equal each other.
.macro berry_tree_palette_slot_table slot .macro berry_tree_palette_slot_table slot
.byte 3, 4, \slot, \slot, \slot .byte 3, 4, \slot, \slot, \slot
.endm .endm
@@ -46,24 +46,24 @@
.macro obj_image_anim_frame pic_id, duration, flags = 0 .macro obj_image_anim_frame pic_id, duration, flags = 0
.2byte \pic_id .2byte \pic_id
.byte (\flags) | (\duration) .byte (\flags) | (\duration)
.byte 0 ; padding .byte 0 @ padding
.endm .endm
.macro obj_image_anim_loop count .macro obj_image_anim_loop count
.2byte 0xfffd .2byte 0xfffd
.byte \count .byte \count
.byte 0 ; padding .byte 0 @ padding
.endm .endm
.macro obj_image_anim_jump target_index .macro obj_image_anim_jump target_index
.2byte 0xfffe .2byte 0xfffe
.byte \target_index .byte \target_index
.byte 0 ; padding .byte 0 @ padding
.endm .endm
.macro obj_image_anim_end .macro obj_image_anim_end
.2byte 0xffff .2byte 0xffff
.2byte 0 ; padding .2byte 0 @ padding
.endm .endm
.macro obj_rot_scal_anim_frame delta_x_scale, delta_y_scale, delta_angle, duration .macro obj_rot_scal_anim_frame delta_x_scale, delta_y_scale, delta_angle, duration
@@ -71,22 +71,22 @@
.2byte \delta_y_scale .2byte \delta_y_scale
.byte \delta_angle .byte \delta_angle
.byte \duration .byte \duration
.2byte 0 ; padding .2byte 0 @ padding
.endm .endm
.macro obj_rot_scal_anim_loop count .macro obj_rot_scal_anim_loop count
.2byte 0x7ffd .2byte 0x7ffd
.2byte \count .2byte \count
.4byte 0 ; padding .4byte 0 @ padding
.endm .endm
.macro obj_rot_scal_anim_jump target_index .macro obj_rot_scal_anim_jump target_index
.2byte 0x7ffe .2byte 0x7ffe
.2byte \target_index .2byte \target_index
.4byte 0 ; padding .4byte 0 @ padding
.endm .endm
.macro obj_rot_scal_anim_end .macro obj_rot_scal_anim_end
.2byte 0x7fff .2byte 0x7fff
.fill 6 ; padding .fill 6 @ padding
.endm .endm
asm/macros/event.s
+178 -178
View File
File diff suppressed because it is too large Load Diff
asm/macros/pokemon_data.s
+6 -6
View File
@@ -1,14 +1,14 @@
.macro pokedex_entry category_name, height, width, text_pointer, pokemon_scale, pokemon_offset, trainer_scale, trainer_offset .macro pokedex_entry category_name, height, width, text_pointer, pokemon_scale, pokemon_offset, trainer_scale, trainer_offset
.charmapstr "\category_name", 12 .charmapstr "\category_name", 12
.2byte \height ; in decimeters .2byte \height @ in decimeters
.2byte \width ; in hectograms .2byte \width @ in hectograms
.4byte \text_pointer .4byte \text_pointer
.2byte 0 ; unused .2byte 0 @ unused
.2byte \pokemon_scale .2byte \pokemon_scale
.2byte \pokemon_offset .2byte \pokemon_offset
.2byte \trainer_scale .2byte \trainer_scale
.2byte \trainer_offset .2byte \trainer_offset
.2byte 0 ; padding .2byte 0 @ padding
.endm .endm
.macro base_stats hp, attack, defense, speed, sp_attack, sp_defense .macro base_stats hp, attack, defense, speed, sp_attack, sp_defense
@@ -32,7 +32,7 @@
.2byte \method .2byte \method
.2byte \parameter .2byte \parameter
.2byte \target_species .2byte \target_species
.2byte 0 ; padding .2byte 0 @ padding
.endm .endm
.macro empty_evo_entries count .macro empty_evo_entries count
@@ -43,7 +43,7 @@
.2byte 20000 + \species .2byte 20000 + \species
.endm .endm
; If the min level equals the max level, only one level argument is needed. @ If the min level equals the max level, only one level argument is needed.
.macro wild_mon species, min_level, max_level .macro wild_mon species, min_level, max_level
.byte \min_level .byte \min_level
asm/macros/window.s
+2 -2
View File
@@ -25,7 +25,7 @@
.byte \glyph_height .byte \glyph_height
.byte \glyph_spacing .byte \glyph_spacing
.byte \line_spacing .byte \line_spacing
.byte \text_color << 4 ; low nybble seems unused .byte \text_color << 4 @ low nybble seems unused
.byte (\shadow_color << 4) | \bg_color .byte (\shadow_color << 4) | \bg_color
.2byte 0 ; padding .2byte 0 @ padding
.endm .endm
asm/main.s
+51 -51
View File
@@ -105,8 +105,8 @@ _080004B2:
thumb_func_end Main thumb_func_end Main
thumb_func_start HandleLinkConnectionAndCallMainCallbacks thumb_func_start HandleLinkConnectionAndCallMainCallbacks
; void HandleLinkConnectionAndCallMainCallbacks() @ void HandleLinkConnectionAndCallMainCallbacks()
HandleLinkConnectionAndCallMainCallbacks: ; 80004C4 HandleLinkConnectionAndCallMainCallbacks: @ 80004C4
push {lr} push {lr}
bl HandleLinkConnection bl HandleLinkConnection
lsls r0, 24 lsls r0, 24
@@ -119,8 +119,8 @@ _080004D4:
thumb_func_end HandleLinkConnectionAndCallMainCallbacks thumb_func_end HandleLinkConnectionAndCallMainCallbacks
thumb_func_start InitVariablesAndSetCopyrightScreenCallback thumb_func_start InitVariablesAndSetCopyrightScreenCallback
; void InitVariablesAndSetCopyrightScreenCallback() @ void InitVariablesAndSetCopyrightScreenCallback()
InitVariablesAndSetCopyrightScreenCallback: ; 80004D8 InitVariablesAndSetCopyrightScreenCallback: @ 80004D8
push {lr} push {lr}
ldr r2, =0x030022c0 ldr r2, =0x030022c0
movs r0, 0 movs r0, 0
@@ -143,8 +143,8 @@ InitVariablesAndSetCopyrightScreenCallback: ; 80004D8
thumb_func_end InitVariablesAndSetCopyrightScreenCallback thumb_func_end InitVariablesAndSetCopyrightScreenCallback
thumb_func_start CallMainCallbacks thumb_func_start CallMainCallbacks
; void CallMainCallbacks() @ void CallMainCallbacks()
CallMainCallbacks: ; 800051C CallMainCallbacks: @ 800051C
push {r4,lr} push {r4,lr}
ldr r4, =0x030022c0 ldr r4, =0x030022c0
ldr r0, [r4] ldr r0, [r4]
@@ -164,8 +164,8 @@ _08000534:
thumb_func_end CallMainCallbacks thumb_func_end CallMainCallbacks
thumb_func_start SetMainCallback2 thumb_func_start SetMainCallback2
; void SetMainCallback2(void ( *func)()) @ void SetMainCallback2(void ( *func)())
SetMainCallback2: ; 8000540 SetMainCallback2: @ 8000540
ldr r1, =0x030022c0 ldr r1, =0x030022c0
str r0, [r1, 0x4] str r0, [r1, 0x4]
movs r0, 0x87 movs r0, 0x87
@@ -178,8 +178,8 @@ SetMainCallback2: ; 8000540
thumb_func_end SetMainCallback2 thumb_func_end SetMainCallback2
thumb_func_start StartTimer1 thumb_func_start StartTimer1
; void StartTimer1() @ void StartTimer1()
StartTimer1: ; 8000554 StartTimer1: @ 8000554
ldr r1, =0x04000106 ldr r1, =0x04000106
movs r0, 0x80 movs r0, 0x80
strh r0, [r1] strh r0, [r1]
@@ -188,8 +188,8 @@ StartTimer1: ; 8000554
thumb_func_end StartTimer1 thumb_func_end StartTimer1
thumb_func_start SeedRngAndSetTrainerId thumb_func_start SeedRngAndSetTrainerId
; void SeedRngAndSetTrainerId() @ void SeedRngAndSetTrainerId()
SeedRngAndSetTrainerId: ; 8000560 SeedRngAndSetTrainerId: @ 8000560
push {r4,lr} push {r4,lr}
ldr r0, =0x04000104 ldr r0, =0x04000104
ldrh r4, [r0] ldrh r4, [r0]
@@ -207,8 +207,8 @@ SeedRngAndSetTrainerId: ; 8000560
thumb_func_end SeedRngAndSetTrainerId thumb_func_end SeedRngAndSetTrainerId
thumb_func_start GetTrainerId thumb_func_start GetTrainerId
; u16 GetTrainerId() @ u16 GetTrainerId()
GetTrainerId: ; 8000588 GetTrainerId: @ 8000588
ldr r0, =0x02020000 ldr r0, =0x02020000
ldrh r0, [r0] ldrh r0, [r0]
bx lr bx lr
@@ -216,8 +216,8 @@ GetTrainerId: ; 8000588
thumb_func_end GetTrainerId thumb_func_end GetTrainerId
thumb_func_start EnableVCountIntrAtLine150 thumb_func_start EnableVCountIntrAtLine150
; void EnableVCountIntrAtLine150() @ void EnableVCountIntrAtLine150()
EnableVCountIntrAtLine150: ; 8000594 EnableVCountIntrAtLine150: @ 8000594
push {lr} push {lr}
movs r0, 0x4 movs r0, 0x4
bl GetGpuReg bl GetGpuReg
@@ -238,8 +238,8 @@ EnableVCountIntrAtLine150: ; 8000594
thumb_func_end EnableVCountIntrAtLine150 thumb_func_end EnableVCountIntrAtLine150
thumb_func_start InitKeypadData thumb_func_start InitKeypadData
; void InitKeypadData() @ void InitKeypadData()
InitKeypadData: ; 80005BC InitKeypadData: @ 80005BC
ldr r1, =0x030026fc ldr r1, =0x030026fc
movs r0, 0x5 movs r0, 0x5
strh r0, [r1] strh r0, [r1]
@@ -258,8 +258,8 @@ InitKeypadData: ; 80005BC
thumb_func_end InitKeypadData thumb_func_end InitKeypadData
thumb_func_start ReadKeypad thumb_func_start ReadKeypad
; void ReadKeypad() @ void ReadKeypad()
ReadKeypad: ; 80005E4 ReadKeypad: @ 80005E4
push {lr} push {lr}
ldr r0, =0x04000130 ldr r0, =0x04000130
ldrh r1, [r0] ldrh r1, [r0]
@@ -337,8 +337,8 @@ _08000676:
thumb_func_end ReadKeypad thumb_func_end ReadKeypad
thumb_func_start InitIntrHandlers thumb_func_start InitIntrHandlers
; void InitIntrHandlers() @ void InitIntrHandlers()
InitIntrHandlers: ; 8000684 InitIntrHandlers: @ 8000684
push {r4,r5,lr} push {r4,r5,lr}
ldr r5, =InterruptMain ldr r5, =InterruptMain
ldr r4, =0x03002750 ldr r4, =0x03002750
@@ -377,8 +377,8 @@ _08000690:
thumb_func_end InitIntrHandlers thumb_func_end InitIntrHandlers
thumb_func_start SetVBlankCallback thumb_func_start SetVBlankCallback
; void SetVBlankCallback(void ( *func)()) @ void SetVBlankCallback(void ( *func)())
SetVBlankCallback: ; 80006F0 SetVBlankCallback: @ 80006F0
ldr r1, =0x030022c0 ldr r1, =0x030022c0
str r0, [r1, 0xC] str r0, [r1, 0xC]
bx lr bx lr
@@ -386,8 +386,8 @@ SetVBlankCallback: ; 80006F0
thumb_func_end SetVBlankCallback thumb_func_end SetVBlankCallback
thumb_func_start SetHBlankCallback thumb_func_start SetHBlankCallback
; void SetHBlankCallback(void ( *func)()) @ void SetHBlankCallback(void ( *func)())
SetHBlankCallback: ; 80006FC SetHBlankCallback: @ 80006FC
ldr r1, =0x030022c0 ldr r1, =0x030022c0
str r0, [r1, 0x10] str r0, [r1, 0x10]
bx lr bx lr
@@ -395,8 +395,8 @@ SetHBlankCallback: ; 80006FC
thumb_func_end SetHBlankCallback thumb_func_end SetHBlankCallback
thumb_func_start SetVCountCallback thumb_func_start SetVCountCallback
; void SetVCountCallback(void ( *func)()) @ void SetVCountCallback(void ( *func)())
SetVCountCallback: ; 8000708 SetVCountCallback: @ 8000708
ldr r1, =0x030022c0 ldr r1, =0x030022c0
str r0, [r1, 0x14] str r0, [r1, 0x14]
bx lr bx lr
@@ -404,8 +404,8 @@ SetVCountCallback: ; 8000708
thumb_func_end SetVCountCallback thumb_func_end SetVCountCallback
thumb_func_start RestoreSerialTimer3IntrHandlers thumb_func_start RestoreSerialTimer3IntrHandlers
; void RestoreSerialTimer3IntrHandlers() @ void RestoreSerialTimer3IntrHandlers()
RestoreSerialTimer3IntrHandlers: ; 8000714 RestoreSerialTimer3IntrHandlers: @ 8000714
ldr r0, =0x03002710 ldr r0, =0x03002710
ldr r1, =SerialIntr ldr r1, =SerialIntr
str r1, [r0, 0x4] str r1, [r0, 0x4]
@@ -416,8 +416,8 @@ RestoreSerialTimer3IntrHandlers: ; 8000714
thumb_func_end RestoreSerialTimer3IntrHandlers thumb_func_end RestoreSerialTimer3IntrHandlers
thumb_func_start SetSerialCallback thumb_func_start SetSerialCallback
; void SetSerialCallback(void ( *func)()) @ void SetSerialCallback(void ( *func)())
SetSerialCallback: ; 800072C SetSerialCallback: @ 800072C
ldr r1, =0x030022c0 ldr r1, =0x030022c0
str r0, [r1, 0x18] str r0, [r1, 0x18]
bx lr bx lr
@@ -425,8 +425,8 @@ SetSerialCallback: ; 800072C
thumb_func_end SetSerialCallback thumb_func_end SetSerialCallback
thumb_func_start VBlankIntr thumb_func_start VBlankIntr
; void VBlankIntr() @ void VBlankIntr()
VBlankIntr: ; 8000738 VBlankIntr: @ 8000738
push {r4,lr} push {r4,lr}
ldr r0, =0x030030fc ldr r0, =0x030030fc
ldrb r0, [r0] ldrb r0, [r0]
@@ -509,8 +509,8 @@ _080007BE:
thumb_func_end VBlankIntr thumb_func_end VBlankIntr
thumb_func_start StartFlashMemoryTimer thumb_func_start StartFlashMemoryTimer
; void StartFlashMemoryTimer() @ void StartFlashMemoryTimer()
StartFlashMemoryTimer: ; 8000800 StartFlashMemoryTimer: @ 8000800
push {lr} push {lr}
ldr r1, =0x0300272c ldr r1, =0x0300272c
movs r0, 0x2 movs r0, 0x2
@@ -521,8 +521,8 @@ StartFlashMemoryTimer: ; 8000800
thumb_func_end StartFlashMemoryTimer thumb_func_end StartFlashMemoryTimer
thumb_func_start HBlankIntr thumb_func_start HBlankIntr
; void HBlankIntr() @ void HBlankIntr()
HBlankIntr: ; 8000814 HBlankIntr: @ 8000814
push {r4,lr} push {r4,lr}
ldr r4, =0x030022c0 ldr r4, =0x030022c0
ldr r0, [r4, 0x10] ldr r0, [r4, 0x10]
@@ -546,8 +546,8 @@ _08000822:
thumb_func_end HBlankIntr thumb_func_end HBlankIntr
thumb_func_start VCountIntr thumb_func_start VCountIntr
; void VCountIntr() @ void VCountIntr()
VCountIntr: ; 8000844 VCountIntr: @ 8000844
push {r4,lr} push {r4,lr}
ldr r4, =0x030022c0 ldr r4, =0x030022c0
ldr r0, [r4, 0x14] ldr r0, [r4, 0x14]
@@ -572,8 +572,8 @@ _08000852:
thumb_func_end VCountIntr thumb_func_end VCountIntr
thumb_func_start SerialIntr thumb_func_start SerialIntr
; void SerialIntr() @ void SerialIntr()
SerialIntr: ; 8000878 SerialIntr: @ 8000878
push {r4,lr} push {r4,lr}
ldr r4, =0x030022c0 ldr r4, =0x030022c0
ldr r0, [r4, 0x18] ldr r0, [r4, 0x18]
@@ -597,14 +597,14 @@ _08000886:
thumb_func_end SerialIntr thumb_func_end SerialIntr
thumb_func_start DummyIntrHandler thumb_func_start DummyIntrHandler
; void DummyIntrHandler() @ void DummyIntrHandler()
DummyIntrHandler: ; 80008A8 DummyIntrHandler: @ 80008A8
bx lr bx lr
thumb_func_end DummyIntrHandler thumb_func_end DummyIntrHandler
thumb_func_start WaitForVBlankIntr thumb_func_start WaitForVBlankIntr
; void WaitForVBlankIntr() @ void WaitForVBlankIntr()
WaitForVBlankIntr: ; 80008AC WaitForVBlankIntr: @ 80008AC
push {lr} push {lr}
ldr r2, =0x030022c0 ldr r2, =0x030022c0
ldrh r1, [r2, 0x1C] ldrh r1, [r2, 0x1C]
@@ -631,7 +631,7 @@ _080008D0:
thumb_func_end WaitForVBlankIntr thumb_func_end WaitForVBlankIntr
thumb_func_start sub_80008DC thumb_func_start sub_80008DC
sub_80008DC: ; 80008DC sub_80008DC: @ 80008DC
ldr r1, =0x0203cf5c ldr r1, =0x0203cf5c
str r0, [r1] str r0, [r1]
bx lr bx lr
@@ -639,7 +639,7 @@ sub_80008DC: ; 80008DC
thumb_func_end sub_80008DC thumb_func_end sub_80008DC
thumb_func_start sub_80008E8 thumb_func_start sub_80008E8
sub_80008E8: ; 80008E8 sub_80008E8: @ 80008E8
ldr r1, =0x0203cf5c ldr r1, =0x0203cf5c
movs r0, 0 movs r0, 0
str r0, [r1] str r0, [r1]
@@ -648,8 +648,8 @@ sub_80008E8: ; 80008E8
thumb_func_end sub_80008E8 thumb_func_end sub_80008E8
thumb_func_start Reset thumb_func_start Reset
; void Reset() @ void Reset()
Reset: ; 80008F4 Reset: @ 80008F4
push {r4,lr} push {r4,lr}
ldr r1, =0x04000208 ldr r1, =0x04000208
movs r0, 0 movs r0, 0
@@ -696,7 +696,7 @@ Reset: ; 80008F4
thumb_func_end Reset thumb_func_end Reset
thumb_func_start sub_8000964 thumb_func_start sub_8000964
sub_8000964: ; 8000964 sub_8000964: @ 8000964
push {lr} push {lr}
sub sp, 0x4 sub sp, 0x4
mov r1, sp mov r1, sp
asm/main_menu.s
+106 -106
View File
@@ -1,6 +1,6 @@
thumb_func_start CB2_MainMenu thumb_func_start CB2_MainMenu
; void CB2_MainMenu() @ void CB2_MainMenu()
CB2_MainMenu: ; 802F6B0 CB2_MainMenu: @ 802F6B0
push {lr} push {lr}
bl RunActiveTasks bl RunActiveTasks
bl CallObjectCallbacks bl CallObjectCallbacks
@@ -11,8 +11,8 @@ CB2_MainMenu: ; 802F6B0
thumb_func_end CB2_MainMenu thumb_func_end CB2_MainMenu
thumb_func_start VBlankCB_MainMenu thumb_func_start VBlankCB_MainMenu
; void VBlankCB_MainMenu() @ void VBlankCB_MainMenu()
VBlankCB_MainMenu: ; 802F6C8 VBlankCB_MainMenu: @ 802F6C8
push {lr} push {lr}
bl LoadOamFromSprites bl LoadOamFromSprites
bl ProcessObjectCopyRequests bl ProcessObjectCopyRequests
@@ -22,8 +22,8 @@ VBlankCB_MainMenu: ; 802F6C8
thumb_func_end VBlankCB_MainMenu thumb_func_end VBlankCB_MainMenu
thumb_func_start CB2_InitMainMenu thumb_func_start CB2_InitMainMenu
; void CB2_InitMainMenu() @ void CB2_InitMainMenu()
CB2_InitMainMenu: ; 802F6DC CB2_InitMainMenu: @ 802F6DC
push {lr} push {lr}
movs r0, 0 movs r0, 0
bl InitMainMenu bl InitMainMenu
@@ -32,8 +32,8 @@ CB2_InitMainMenu: ; 802F6DC
thumb_func_end CB2_InitMainMenu thumb_func_end CB2_InitMainMenu
thumb_func_start CB2_ReinitMainMenu thumb_func_start CB2_ReinitMainMenu
; void CB2_ReinitMainMenu() @ void CB2_ReinitMainMenu()
CB2_ReinitMainMenu: ; 802F6E8 CB2_ReinitMainMenu: @ 802F6E8
push {lr} push {lr}
movs r0, 0x1 movs r0, 0x1
bl InitMainMenu bl InitMainMenu
@@ -42,8 +42,8 @@ CB2_ReinitMainMenu: ; 802F6E8
thumb_func_end CB2_ReinitMainMenu thumb_func_end CB2_ReinitMainMenu
thumb_func_start InitMainMenu thumb_func_start InitMainMenu
; void InitMainMenu(bool8 affects_palette_maybe) @ void InitMainMenu(bool8 affects_palette_maybe)
InitMainMenu: ; 802F6F4 InitMainMenu: @ 802F6F4
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0xC sub sp, 0xC
adds r4, r0, 0 adds r4, r0, 0
@@ -220,8 +220,8 @@ _0802F7FE:
thumb_func_end InitMainMenu thumb_func_end InitMainMenu
thumb_func_start Task_MainMenuCheckSaveFile thumb_func_start Task_MainMenuCheckSaveFile
; void Task_MainMenuCheckSaveFile(u8 taskId) @ void Task_MainMenuCheckSaveFile(u8 taskId)
Task_MainMenuCheckSaveFile: ; 802F8D8 Task_MainMenuCheckSaveFile: @ 802F8D8
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -403,8 +403,8 @@ _0802FA4E:
thumb_func_end Task_MainMenuCheckSaveFile thumb_func_end Task_MainMenuCheckSaveFile
thumb_func_start Task_WaitForSaveFileErrorWindow thumb_func_start Task_WaitForSaveFileErrorWindow
; void Task_WaitForSaveFileErrorWindow(u8 taskId) @ void Task_WaitForSaveFileErrorWindow(u8 taskId)
Task_WaitForSaveFileErrorWindow: ; 802FA5C Task_WaitForSaveFileErrorWindow: @ 802FA5C
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -439,8 +439,8 @@ _0802FA98:
thumb_func_end Task_WaitForSaveFileErrorWindow thumb_func_end Task_WaitForSaveFileErrorWindow
thumb_func_start Task_MainMenuCheckBattery thumb_func_start Task_MainMenuCheckBattery
; void Task_MainMenuCheckBattery(u8 taskId) @ void Task_MainMenuCheckBattery(u8 taskId)
Task_MainMenuCheckBattery: ; 802FAB0 Task_MainMenuCheckBattery: @ 802FAB0
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -505,8 +505,8 @@ _0802FB3C:
thumb_func_end Task_MainMenuCheckBattery thumb_func_end Task_MainMenuCheckBattery
thumb_func_start Task_WaitForBatteryDryErrorWindow thumb_func_start Task_WaitForBatteryDryErrorWindow
; void Task_WaitForBatteryDryErrorWindow(u8 taskId) @ void Task_WaitForBatteryDryErrorWindow(u8 taskId)
Task_WaitForBatteryDryErrorWindow: ; 802FB50 Task_WaitForBatteryDryErrorWindow: @ 802FB50
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -541,8 +541,8 @@ _0802FB8C:
thumb_func_end Task_WaitForBatteryDryErrorWindow thumb_func_end Task_WaitForBatteryDryErrorWindow
thumb_func_start Task_DisplayMainMenu thumb_func_start Task_DisplayMainMenu
; void Task_DisplayMainMenu(u8 taskId) @ void Task_DisplayMainMenu(u8 taskId)
Task_DisplayMainMenu: ; 802FBA4 Task_DisplayMainMenu: @ 802FBA4
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r9 mov r7, r9
mov r6, r8 mov r6, r8
@@ -1036,8 +1036,8 @@ _0803006C:
thumb_func_end Task_DisplayMainMenu thumb_func_end Task_DisplayMainMenu
thumb_func_start Task_HighlightSelectedMainMenuItem thumb_func_start Task_HighlightSelectedMainMenuItem
; void Task_HighlightSelectedMainMenuItem(u8 taskId) @ void Task_HighlightSelectedMainMenuItem(u8 taskId)
Task_HighlightSelectedMainMenuItem: ; 80300B0 Task_HighlightSelectedMainMenuItem: @ 80300B0
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -1060,8 +1060,8 @@ Task_HighlightSelectedMainMenuItem: ; 80300B0
thumb_func_end Task_HighlightSelectedMainMenuItem thumb_func_end Task_HighlightSelectedMainMenuItem
thumb_func_start HandleMainMenuInput thumb_func_start HandleMainMenuInput
; u8 HandleMainMenuInput(u8 taskId) @ u8 HandleMainMenuInput(u8 taskId)
HandleMainMenuInput: ; 80300E0 HandleMainMenuInput: @ 80300E0
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x4 sub sp, 0x4
lsls r0, 24 lsls r0, 24
@@ -1231,8 +1231,8 @@ _08030242:
thumb_func_end HandleMainMenuInput thumb_func_end HandleMainMenuInput
thumb_func_start Task_HandleMainMenuInput thumb_func_start Task_HandleMainMenuInput
; void Task_HandleMainMenuInput(u8 taskId) @ void Task_HandleMainMenuInput(u8 taskId)
Task_HandleMainMenuInput: ; 803024C Task_HandleMainMenuInput: @ 803024C
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -1256,8 +1256,8 @@ _0803026C:
thumb_func_end Task_HandleMainMenuInput thumb_func_end Task_HandleMainMenuInput
thumb_func_start Task_HandleMainMenuAPressed thumb_func_start Task_HandleMainMenuAPressed
; void Task_HandleMainMenuAPressed(int task_id) @ void Task_HandleMainMenuAPressed(int task_id)
Task_HandleMainMenuAPressed: ; 803027C Task_HandleMainMenuAPressed: @ 803027C
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x4 sub sp, 0x4
lsls r0, 24 lsls r0, 24
@@ -1570,8 +1570,8 @@ _08030536:
thumb_func_end Task_HandleMainMenuAPressed thumb_func_end Task_HandleMainMenuAPressed
thumb_func_start Task_HandleMainMenuBPressed thumb_func_start Task_HandleMainMenuBPressed
; void Task_HandleMainMenuBPressed(u8 taskId) @ void Task_HandleMainMenuBPressed(u8 taskId)
Task_HandleMainMenuBPressed: ; 8030544 Task_HandleMainMenuBPressed: @ 8030544
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
@@ -1613,8 +1613,8 @@ _0803058C:
thumb_func_end Task_HandleMainMenuBPressed thumb_func_end Task_HandleMainMenuBPressed
thumb_func_start Task_DisplayMainMenuInvalidActionError thumb_func_start Task_DisplayMainMenuInvalidActionError
; void Task_DisplayMainMenuInvalidActionError(u8 taskId) @ void Task_DisplayMainMenuInvalidActionError(u8 taskId)
Task_DisplayMainMenuInvalidActionError: ; 80305A4 Task_DisplayMainMenuInvalidActionError: @ 80305A4
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x8 sub sp, 0x8
lsls r0, 24 lsls r0, 24
@@ -1732,8 +1732,8 @@ _08030688:
thumb_func_end Task_DisplayMainMenuInvalidActionError thumb_func_end Task_DisplayMainMenuInvalidActionError
thumb_func_start HighlightSelectedMainMenuItem thumb_func_start HighlightSelectedMainMenuItem
; void HighlightSelectedMainMenuItem(u8 a1, u8 selectedMenuItem, u16 a3) @ void HighlightSelectedMainMenuItem(u8 a1, u8 selectedMenuItem, u16 a3)
HighlightSelectedMainMenuItem: ; 8030698 HighlightSelectedMainMenuItem: @ 8030698
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
@@ -1870,8 +1870,8 @@ _080307A4:
thumb_func_end HighlightSelectedMainMenuItem thumb_func_end HighlightSelectedMainMenuItem
thumb_func_start task_new_game_prof_birch_speech_1 thumb_func_start task_new_game_prof_birch_speech_1
; void task_new_game_prof_birch_speech_1(int task_id) @ void task_new_game_prof_birch_speech_1(int task_id)
task_new_game_prof_birch_speech_1: ; 80307B0 task_new_game_prof_birch_speech_1: @ 80307B0
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x4 sub sp, 0x4
adds r4, r0, 0 adds r4, r0, 0
@@ -1964,7 +1964,7 @@ task_new_game_prof_birch_speech_1: ; 80307B0
thumb_func_end task_new_game_prof_birch_speech_1 thumb_func_end task_new_game_prof_birch_speech_1
thumb_func_start task_new_game_prof_birch_speech_2 thumb_func_start task_new_game_prof_birch_speech_2
task_new_game_prof_birch_speech_2: ; 80308B0 task_new_game_prof_birch_speech_2: @ 80308B0
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
@@ -2024,8 +2024,8 @@ _0803091A:
thumb_func_end task_new_game_prof_birch_speech_2 thumb_func_end task_new_game_prof_birch_speech_2
thumb_func_start task_new_game_prof_birch_speech_3 thumb_func_start task_new_game_prof_birch_speech_3
; int task_new_game_prof_birch_speech_3() @ int task_new_game_prof_birch_speech_3()
task_new_game_prof_birch_speech_3: ; 8030928 task_new_game_prof_birch_speech_3: @ 8030928
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -2094,7 +2094,7 @@ _080309B6:
thumb_func_end task_new_game_prof_birch_speech_3 thumb_func_end task_new_game_prof_birch_speech_3
thumb_func_start task_new_game_prof_birch_speech_4 thumb_func_start task_new_game_prof_birch_speech_4
task_new_game_prof_birch_speech_4: ; 80309CC task_new_game_prof_birch_speech_4: @ 80309CC
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -2131,7 +2131,7 @@ _08030A0A:
thumb_func_end task_new_game_prof_birch_speech_4 thumb_func_end task_new_game_prof_birch_speech_4
thumb_func_start task_new_game_prof_birch_speech_5 thumb_func_start task_new_game_prof_birch_speech_5
task_new_game_prof_birch_speech_5: ; 8030A2C task_new_game_prof_birch_speech_5: @ 8030A2C
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -2159,7 +2159,7 @@ _08030A58:
thumb_func_end task_new_game_prof_birch_speech_5 thumb_func_end task_new_game_prof_birch_speech_5
thumb_func_start sub_8030A70 thumb_func_start sub_8030A70
sub_8030A70: ; 8030A70 sub_8030A70: @ 8030A70
push {r4-r6,lr} push {r4-r6,lr}
mov r6, r8 mov r6, r8
push {r6} push {r6}
@@ -2232,7 +2232,7 @@ sub_8030A70: ; 8030A70
thumb_func_end sub_8030A70 thumb_func_end sub_8030A70
thumb_func_start sub_8030B14 thumb_func_start sub_8030B14
sub_8030B14: ; 8030B14 sub_8030B14: @ 8030B14
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -2323,7 +2323,7 @@ _08030BBA:
thumb_func_end sub_8030B14 thumb_func_end sub_8030B14
thumb_func_start task_new_game_prof_birch_speech_6 thumb_func_start task_new_game_prof_birch_speech_6
task_new_game_prof_birch_speech_6: ; 8030BCC task_new_game_prof_birch_speech_6: @ 8030BCC
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -2354,7 +2354,7 @@ _08030BFE:
thumb_func_end task_new_game_prof_birch_speech_6 thumb_func_end task_new_game_prof_birch_speech_6
thumb_func_start task_new_game_prof_birch_speech_7 thumb_func_start task_new_game_prof_birch_speech_7
task_new_game_prof_birch_speech_7: ; 8030C18 task_new_game_prof_birch_speech_7: @ 8030C18
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
@@ -2410,7 +2410,7 @@ _08030C7C:
thumb_func_end task_new_game_prof_birch_speech_7 thumb_func_end task_new_game_prof_birch_speech_7
thumb_func_start task_new_game_prof_birch_speech_8 thumb_func_start task_new_game_prof_birch_speech_8
task_new_game_prof_birch_speech_8: ; 8030C90 task_new_game_prof_birch_speech_8: @ 8030C90
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -2445,7 +2445,7 @@ _08030CC8:
thumb_func_end task_new_game_prof_birch_speech_8 thumb_func_end task_new_game_prof_birch_speech_8
thumb_func_start task_new_game_prof_birch_speech_9 thumb_func_start task_new_game_prof_birch_speech_9
task_new_game_prof_birch_speech_9: ; 8030CD4 task_new_game_prof_birch_speech_9: @ 8030CD4
push {r4-r7,lr} push {r4-r7,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -2532,7 +2532,7 @@ _08030D7A:
thumb_func_end task_new_game_prof_birch_speech_9 thumb_func_end task_new_game_prof_birch_speech_9
thumb_func_start task_new_game_prof_birch_speech_10 thumb_func_start task_new_game_prof_birch_speech_10
task_new_game_prof_birch_speech_10: ; 8030D84 task_new_game_prof_birch_speech_10: @ 8030D84
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -2566,7 +2566,7 @@ _08030DB8:
thumb_func_end task_new_game_prof_birch_speech_10 thumb_func_end task_new_game_prof_birch_speech_10
thumb_func_start task_new_game_prof_birch_speech_11 thumb_func_start task_new_game_prof_birch_speech_11
task_new_game_prof_birch_speech_11: ; 8030DC8 task_new_game_prof_birch_speech_11: @ 8030DC8
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
@@ -2592,7 +2592,7 @@ task_new_game_prof_birch_speech_11: ; 8030DC8
thumb_func_end task_new_game_prof_birch_speech_11 thumb_func_end task_new_game_prof_birch_speech_11
thumb_func_start task_new_game_prof_birch_speech_12 thumb_func_start task_new_game_prof_birch_speech_12
task_new_game_prof_birch_speech_12: ; 8030E08 task_new_game_prof_birch_speech_12: @ 8030E08
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -2616,7 +2616,7 @@ _08030E2A:
thumb_func_end task_new_game_prof_birch_speech_12 thumb_func_end task_new_game_prof_birch_speech_12
thumb_func_start task_new_game_prof_birch_speech_13 thumb_func_start task_new_game_prof_birch_speech_13
task_new_game_prof_birch_speech_13: ; 8030E38 task_new_game_prof_birch_speech_13: @ 8030E38
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
@@ -2686,7 +2686,7 @@ _08030EB8:
thumb_func_end task_new_game_prof_birch_speech_13 thumb_func_end task_new_game_prof_birch_speech_13
thumb_func_start sub_8030ED4 thumb_func_start sub_8030ED4
sub_8030ED4: ; 8030ED4 sub_8030ED4: @ 8030ED4
push {r4-r7,lr} push {r4-r7,lr}
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
@@ -2771,7 +2771,7 @@ _08030F72:
thumb_func_end sub_8030ED4 thumb_func_end sub_8030ED4
thumb_func_start sub_8030F7C thumb_func_start sub_8030F7C
sub_8030F7C: ; 8030F7C sub_8030F7C: @ 8030F7C
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -2817,7 +2817,7 @@ _08030FCA:
thumb_func_end sub_8030F7C thumb_func_end sub_8030F7C
thumb_func_start task_new_game_prof_birch_speech_14 thumb_func_start task_new_game_prof_birch_speech_14
task_new_game_prof_birch_speech_14: ; 8030FD4 task_new_game_prof_birch_speech_14: @ 8030FD4
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
@@ -2843,7 +2843,7 @@ task_new_game_prof_birch_speech_14: ; 8030FD4
thumb_func_end task_new_game_prof_birch_speech_14 thumb_func_end task_new_game_prof_birch_speech_14
thumb_func_start task_new_game_prof_birch_speech_15 thumb_func_start task_new_game_prof_birch_speech_15
task_new_game_prof_birch_speech_15: ; 8031014 task_new_game_prof_birch_speech_15: @ 8031014
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -2866,7 +2866,7 @@ _08031032:
thumb_func_end task_new_game_prof_birch_speech_15 thumb_func_end task_new_game_prof_birch_speech_15
thumb_func_start task_new_game_prof_birch_speech_16 thumb_func_start task_new_game_prof_birch_speech_16
task_new_game_prof_birch_speech_16: ; 8031040 task_new_game_prof_birch_speech_16: @ 8031040
push {r4,lr} push {r4,lr}
sub sp, 0x4 sub sp, 0x4
lsls r0, 24 lsls r0, 24
@@ -2905,7 +2905,7 @@ _0803107A:
thumb_func_end task_new_game_prof_birch_speech_16 thumb_func_end task_new_game_prof_birch_speech_16
thumb_func_start task_new_game_prof_birch_speech_17 thumb_func_start task_new_game_prof_birch_speech_17
task_new_game_prof_birch_speech_17: ; 8031090 task_new_game_prof_birch_speech_17: @ 8031090
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x8 sub sp, 0x8
lsls r0, 24 lsls r0, 24
@@ -2954,7 +2954,7 @@ _080310EC:
thumb_func_end task_new_game_prof_birch_speech_17 thumb_func_end task_new_game_prof_birch_speech_17
thumb_func_start task_new_game_prof_birch_speech_part2_2 thumb_func_start task_new_game_prof_birch_speech_part2_2
task_new_game_prof_birch_speech_part2_2: ; 8031104 task_new_game_prof_birch_speech_part2_2: @ 8031104
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
@@ -2980,7 +2980,7 @@ task_new_game_prof_birch_speech_part2_2: ; 8031104
thumb_func_end task_new_game_prof_birch_speech_part2_2 thumb_func_end task_new_game_prof_birch_speech_part2_2
thumb_func_start task_new_game_prof_birch_speech_part2_3 thumb_func_start task_new_game_prof_birch_speech_part2_3
task_new_game_prof_birch_speech_part2_3: ; 8031144 task_new_game_prof_birch_speech_part2_3: @ 8031144
push {r4,lr} push {r4,lr}
sub sp, 0x8 sub sp, 0x8
lsls r0, 24 lsls r0, 24
@@ -3014,7 +3014,7 @@ _08031178:
thumb_func_end task_new_game_prof_birch_speech_part2_3 thumb_func_end task_new_game_prof_birch_speech_part2_3
thumb_func_start task_new_game_prof_birch_speech_part2_4 thumb_func_start task_new_game_prof_birch_speech_part2_4
task_new_game_prof_birch_speech_part2_4: ; 8031188 task_new_game_prof_birch_speech_part2_4: @ 8031188
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
@@ -3084,7 +3084,7 @@ _08031210:
thumb_func_end task_new_game_prof_birch_speech_part2_4 thumb_func_end task_new_game_prof_birch_speech_part2_4
thumb_func_start task_new_game_prof_birch_speech_part2_5 thumb_func_start task_new_game_prof_birch_speech_part2_5
task_new_game_prof_birch_speech_part2_5: ; 8031220 task_new_game_prof_birch_speech_part2_5: @ 8031220
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -3115,7 +3115,7 @@ _08031250:
thumb_func_end task_new_game_prof_birch_speech_part2_5 thumb_func_end task_new_game_prof_birch_speech_part2_5
thumb_func_start task_new_game_prof_birch_speech_part2_6 thumb_func_start task_new_game_prof_birch_speech_part2_6
task_new_game_prof_birch_speech_part2_6: ; 8031258 task_new_game_prof_birch_speech_part2_6: @ 8031258
push {r4-r7,lr} push {r4-r7,lr}
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
@@ -3219,7 +3219,7 @@ _08031320:
thumb_func_end task_new_game_prof_birch_speech_part2_6 thumb_func_end task_new_game_prof_birch_speech_part2_6
thumb_func_start task_new_game_prof_birch_speech_part2_7 thumb_func_start task_new_game_prof_birch_speech_part2_7
task_new_game_prof_birch_speech_part2_7: ; 803133C task_new_game_prof_birch_speech_part2_7: @ 803133C
push {r4-r7,lr} push {r4-r7,lr}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
@@ -3300,7 +3300,7 @@ _080313D2:
thumb_func_end task_new_game_prof_birch_speech_part2_7 thumb_func_end task_new_game_prof_birch_speech_part2_7
thumb_func_start task_new_game_prof_birch_speech_part2_8 thumb_func_start task_new_game_prof_birch_speech_part2_8
task_new_game_prof_birch_speech_part2_8: ; 80313E4 task_new_game_prof_birch_speech_part2_8: @ 80313E4
push {r4-r7,lr} push {r4-r7,lr}
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
@@ -3404,7 +3404,7 @@ _080314B0:
thumb_func_end task_new_game_prof_birch_speech_part2_8 thumb_func_end task_new_game_prof_birch_speech_part2_8
thumb_func_start task_new_game_prof_birch_speech_part2_9 thumb_func_start task_new_game_prof_birch_speech_part2_9
task_new_game_prof_birch_speech_part2_9: ; 80314C4 task_new_game_prof_birch_speech_part2_9: @ 80314C4
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -3487,7 +3487,7 @@ _0803155C:
thumb_func_end task_new_game_prof_birch_speech_part2_9 thumb_func_end task_new_game_prof_birch_speech_part2_9
thumb_func_start task_new_game_prof_birch_speech_part2_10 thumb_func_start task_new_game_prof_birch_speech_part2_10
task_new_game_prof_birch_speech_part2_10: ; 8031580 task_new_game_prof_birch_speech_part2_10: @ 8031580
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -3516,7 +3516,7 @@ _080315AA:
thumb_func_end task_new_game_prof_birch_speech_part2_10 thumb_func_end task_new_game_prof_birch_speech_part2_10
thumb_func_start task_new_game_prof_birch_speech_part2_11 thumb_func_start task_new_game_prof_birch_speech_part2_11
task_new_game_prof_birch_speech_part2_11: ; 80315BC task_new_game_prof_birch_speech_part2_11: @ 80315BC
push {r4,lr} push {r4,lr}
sub sp, 0x4 sub sp, 0x4
lsls r0, 24 lsls r0, 24
@@ -3563,7 +3563,7 @@ _0803160A:
thumb_func_end task_new_game_prof_birch_speech_part2_11 thumb_func_end task_new_game_prof_birch_speech_part2_11
thumb_func_start task_new_game_prof_birch_speech_part2_12 thumb_func_start task_new_game_prof_birch_speech_part2_12
task_new_game_prof_birch_speech_part2_12: ; 8031630 task_new_game_prof_birch_speech_part2_12: @ 8031630
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -3594,7 +3594,7 @@ _08031666:
thumb_func_end task_new_game_prof_birch_speech_part2_12 thumb_func_end task_new_game_prof_birch_speech_part2_12
thumb_func_start new_game_prof_birch_speech_part2_start thumb_func_start new_game_prof_birch_speech_part2_start
new_game_prof_birch_speech_part2_start: ; 8031678 new_game_prof_birch_speech_part2_start: @ 8031678
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0xC sub sp, 0xC
movs r0, 0 movs r0, 0
@@ -3812,12 +3812,12 @@ _080317E0:
thumb_func_end new_game_prof_birch_speech_part2_start thumb_func_end new_game_prof_birch_speech_part2_start
thumb_func_start nullsub_11 thumb_func_start nullsub_11
nullsub_11: ; 80318D4 nullsub_11: @ 80318D4
bx lr bx lr
thumb_func_end nullsub_11 thumb_func_end nullsub_11
thumb_func_start sub_80318D8 thumb_func_start sub_80318D8
sub_80318D8: ; 80318D8 sub_80318D8: @ 80318D8
movs r2, 0x22 movs r2, 0x22
ldrsh r1, [r0, r2] ldrsh r1, [r0, r2]
lsls r1, 16 lsls r1, 16
@@ -3834,7 +3834,7 @@ sub_80318D8: ; 80318D8
thumb_func_end sub_80318D8 thumb_func_end sub_80318D8
thumb_func_start sub_80318F4 thumb_func_start sub_80318F4
sub_80318F4: ; 80318F4 sub_80318F4: @ 80318F4
push {lr} push {lr}
sub sp, 0x10 sub sp, 0x10
lsls r0, 24 lsls r0, 24
@@ -3862,8 +3862,8 @@ sub_80318F4: ; 80318F4
thumb_func_end sub_80318F4 thumb_func_end sub_80318F4
thumb_func_start AddBirchSpeechObjects thumb_func_start AddBirchSpeechObjects
; void AddBirchSpeechObjects(u8 taskId) @ void AddBirchSpeechObjects(u8 taskId)
AddBirchSpeechObjects: ; 803192C AddBirchSpeechObjects: @ 803192C
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -4006,7 +4006,7 @@ AddBirchSpeechObjects: ; 803192C
thumb_func_end AddBirchSpeechObjects thumb_func_end AddBirchSpeechObjects
thumb_func_start sub_8031A5C thumb_func_start sub_8031A5C
sub_8031A5C: ; 8031A5C sub_8031A5C: @ 8031A5C
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
@@ -4064,7 +4064,7 @@ _08031AC4:
thumb_func_end sub_8031A5C thumb_func_end sub_8031A5C
thumb_func_start sub_8031ACC thumb_func_start sub_8031ACC
sub_8031ACC: ; 8031ACC sub_8031ACC: @ 8031ACC
push {r4-r6,lr} push {r4-r6,lr}
mov r6, r8 mov r6, r8
push {r6} push {r6}
@@ -4116,7 +4116,7 @@ sub_8031ACC: ; 8031ACC
thumb_func_end sub_8031ACC thumb_func_end sub_8031ACC
thumb_func_start sub_8031B3C thumb_func_start sub_8031B3C
sub_8031B3C: ; 8031B3C sub_8031B3C: @ 8031B3C
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
@@ -4174,7 +4174,7 @@ _08031BA4:
thumb_func_end sub_8031B3C thumb_func_end sub_8031B3C
thumb_func_start sub_8031BAC thumb_func_start sub_8031BAC
sub_8031BAC: ; 8031BAC sub_8031BAC: @ 8031BAC
push {r4-r6,lr} push {r4-r6,lr}
mov r6, r8 mov r6, r8
push {r6} push {r6}
@@ -4227,7 +4227,7 @@ sub_8031BAC: ; 8031BAC
thumb_func_end sub_8031BAC thumb_func_end sub_8031BAC
thumb_func_start sub_8031C1C thumb_func_start sub_8031C1C
sub_8031C1C: ; 8031C1C sub_8031C1C: @ 8031C1C
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
@@ -4284,7 +4284,7 @@ _08031C7C:
thumb_func_end sub_8031C1C thumb_func_end sub_8031C1C
thumb_func_start sub_8031C88 thumb_func_start sub_8031C88
sub_8031C88: ; 8031C88 sub_8031C88: @ 8031C88
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -4316,7 +4316,7 @@ sub_8031C88: ; 8031C88
thumb_func_end sub_8031C88 thumb_func_end sub_8031C88
thumb_func_start sub_8031CC8 thumb_func_start sub_8031CC8
sub_8031CC8: ; 8031CC8 sub_8031CC8: @ 8031CC8
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
@@ -4373,7 +4373,7 @@ _08031D28:
thumb_func_end sub_8031CC8 thumb_func_end sub_8031CC8
thumb_func_start sub_8031D34 thumb_func_start sub_8031D34
sub_8031D34: ; 8031D34 sub_8031D34: @ 8031D34
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -4404,7 +4404,7 @@ sub_8031D34: ; 8031D34
thumb_func_end sub_8031D34 thumb_func_end sub_8031D34
thumb_func_start sub_8031D74 thumb_func_start sub_8031D74
sub_8031D74: ; 8031D74 sub_8031D74: @ 8031D74
push {lr} push {lr}
ldr r0, =gUnknown_082FF088 ldr r0, =gUnknown_082FF088
movs r1, 0xF3 movs r1, 0xF3
@@ -4431,7 +4431,7 @@ sub_8031D74: ; 8031D74
thumb_func_end sub_8031D74 thumb_func_end sub_8031D74
thumb_func_start sub_8031DB4 thumb_func_start sub_8031DB4
sub_8031DB4: ; 8031DB4 sub_8031DB4: @ 8031DB4
push {lr} push {lr}
bl ProcessMenuInputNoWrapAround bl ProcessMenuInputNoWrapAround
lsls r0, 24 lsls r0, 24
@@ -4441,8 +4441,8 @@ sub_8031DB4: ; 8031DB4
thumb_func_end sub_8031DB4 thumb_func_end sub_8031DB4
thumb_func_start set_default_player_name thumb_func_start set_default_player_name
; void set_default_player_name(int name_id) @ void set_default_player_name(int name_id)
set_default_player_name: ; 8031DC4 set_default_player_name: @ 8031DC4
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
@@ -4484,8 +4484,8 @@ _08031DF0:
thumb_func_end set_default_player_name thumb_func_end set_default_player_name
thumb_func_start CreateMainMenuErrorWindow thumb_func_start CreateMainMenuErrorWindow
; void CreateMainMenuErrorWindow(u8 *str) @ void CreateMainMenuErrorWindow(u8 *str)
CreateMainMenuErrorWindow: ; 8031E18 CreateMainMenuErrorWindow: @ 8031E18
push {r4,lr} push {r4,lr}
sub sp, 0xC sub sp, 0xC
adds r4, r0, 0 adds r4, r0, 0
@@ -4525,7 +4525,7 @@ CreateMainMenuErrorWindow: ; 8031E18
thumb_func_end CreateMainMenuErrorWindow thumb_func_end CreateMainMenuErrorWindow
thumb_func_start fmt_savegame thumb_func_start fmt_savegame
fmt_savegame: ; 8031E7C fmt_savegame: @ 8031E7C
push {lr} push {lr}
bl fmt_time bl fmt_time
bl fmt_pokedex bl fmt_pokedex
@@ -4536,7 +4536,7 @@ fmt_savegame: ; 8031E7C
thumb_func_end fmt_savegame thumb_func_end fmt_savegame
thumb_func_start fmt_time thumb_func_start fmt_time
fmt_time: ; 8031E94 fmt_time: @ 8031E94
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0xC sub sp, 0xC
ldr r4, =0x02021fc4 ldr r4, =0x02021fc4
@@ -4578,7 +4578,7 @@ fmt_time: ; 8031E94
thumb_func_end fmt_time thumb_func_end fmt_time
thumb_func_start fmt_player thumb_func_start fmt_player
fmt_player: ; 8031EF8 fmt_player: @ 8031EF8
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x2C sub sp, 0x2C
ldr r4, =0x02021fc4 ldr r4, =0x02021fc4
@@ -4634,7 +4634,7 @@ fmt_player: ; 8031EF8
thumb_func_end fmt_player thumb_func_end fmt_player
thumb_func_start fmt_pokedex thumb_func_start fmt_pokedex
fmt_pokedex: ; 8031F7C fmt_pokedex: @ 8031F7C
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x2C sub sp, 0x2C
ldr r0, =0x00000861 ldr r0, =0x00000861
@@ -4700,7 +4700,7 @@ _08031FFE:
thumb_func_end fmt_pokedex thumb_func_end fmt_pokedex
thumb_func_start fmt_badges thumb_func_start fmt_badges
fmt_badges: ; 8032014 fmt_badges: @ 8032014
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x2C sub sp, 0x2C
movs r7, 0 movs r7, 0
@@ -4763,8 +4763,8 @@ _08032030:
thumb_func_end fmt_badges thumb_func_end fmt_badges
thumb_func_start LoadMainMenuWindowFrameTiles thumb_func_start LoadMainMenuWindowFrameTiles
; void LoadMainMenuWindowFrameTiles(u8 bgId, u16 tileOffset) @ void LoadMainMenuWindowFrameTiles(u8 bgId, u16 tileOffset)
LoadMainMenuWindowFrameTiles: ; 80320A4 LoadMainMenuWindowFrameTiles: @ 80320A4
push {r4-r6,lr} push {r4-r6,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -4798,8 +4798,8 @@ LoadMainMenuWindowFrameTiles: ; 80320A4
thumb_func_end LoadMainMenuWindowFrameTiles thumb_func_end LoadMainMenuWindowFrameTiles
thumb_func_start DrawMainMenuWindowBorder thumb_func_start DrawMainMenuWindowBorder
; void DrawMainMenuWindowBorder(struct WindowTemplate *template, u16 baseTileNum) @ void DrawMainMenuWindowBorder(struct WindowTemplate *template, u16 baseTileNum)
DrawMainMenuWindowBorder: ; 80320EC DrawMainMenuWindowBorder: @ 80320EC
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -4972,7 +4972,7 @@ DrawMainMenuWindowBorder: ; 80320EC
thumb_func_end DrawMainMenuWindowBorder thumb_func_end DrawMainMenuWindowBorder
thumb_func_start sub_8032250 thumb_func_start sub_8032250
sub_8032250: ; 8032250 sub_8032250: @ 8032250
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0xC sub sp, 0xC
adds r6, r0, 0 adds r6, r0, 0
@@ -5010,7 +5010,7 @@ sub_8032250: ; 8032250
thumb_func_end sub_8032250 thumb_func_end sub_8032250
thumb_func_start sub_8032298 thumb_func_start sub_8032298
sub_8032298: ; 8032298 sub_8032298: @ 8032298
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0xC sub sp, 0xC
adds r4, r1, 0 adds r4, r1, 0
@@ -5049,7 +5049,7 @@ sub_8032298: ; 8032298
thumb_func_end sub_8032298 thumb_func_end sub_8032298
thumb_func_start sub_80322E0 thumb_func_start sub_80322E0
sub_80322E0: ; 80322E0 sub_80322E0: @ 80322E0
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r1, 0 adds r4, r1, 0
lsls r0, 24 lsls r0, 24
@@ -5077,7 +5077,7 @@ _0803230E:
thumb_func_end sub_80322E0 thumb_func_end sub_80322E0
thumb_func_start sub_8032318 thumb_func_start sub_8032318
sub_8032318: ; 8032318 sub_8032318: @ 8032318
push {r4-r6,lr} push {r4-r6,lr}
mov r6, r9 mov r6, r9
mov r5, r8 mov r5, r8
@@ -5142,7 +5142,7 @@ sub_8032318: ; 8032318
thumb_func_end sub_8032318 thumb_func_end sub_8032318
thumb_func_start sub_80323A0 thumb_func_start sub_80323A0
sub_80323A0: ; 80323A0 sub_80323A0: @ 80323A0
push {lr} push {lr}
ldr r0, [r0] ldr r0, [r0]
subs r0, 0x2 subs r0, 0x2
@@ -5165,7 +5165,7 @@ _080323C0:
thumb_func_end sub_80323A0 thumb_func_end sub_80323A0
thumb_func_start sub_80323CC thumb_func_start sub_80323CC
sub_80323CC: ; 80323CC sub_80323CC: @ 80323CC
push {r4-r6,lr} push {r4-r6,lr}
mov r6, r8 mov r6, r8
push {r6} push {r6}
@@ -5222,7 +5222,7 @@ sub_80323CC: ; 80323CC
thumb_func_end sub_80323CC thumb_func_end sub_80323CC
thumb_func_start unknown_rbox_to_vram thumb_func_start unknown_rbox_to_vram
unknown_rbox_to_vram: ; 803243C unknown_rbox_to_vram: @ 803243C
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r1, 0 adds r4, r1, 0
lsls r0, 24 lsls r0, 24
@@ -5250,7 +5250,7 @@ _0803246A:
thumb_func_end unknown_rbox_to_vram thumb_func_end unknown_rbox_to_vram
thumb_func_start sub_8032474 thumb_func_start sub_8032474
sub_8032474: ; 8032474 sub_8032474: @ 8032474
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -5440,7 +5440,7 @@ sub_8032474: ; 8032474
thumb_func_end sub_8032474 thumb_func_end sub_8032474
thumb_func_start task_new_game_prof_birch_speech_part2_1 thumb_func_start task_new_game_prof_birch_speech_part2_1
task_new_game_prof_birch_speech_part2_1: ; 803261C task_new_game_prof_birch_speech_part2_1: @ 803261C
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
asm/malloc.s
+24 -24
View File
@@ -1,6 +1,6 @@
thumb_func_start PutMemBlockHeader thumb_func_start PutMemBlockHeader
; void PutMemBlockHeader(void *block, struct MemBlock *prev, struct MemBlock *next, u32 size) @ void PutMemBlockHeader(void *block, struct MemBlock *prev, struct MemBlock *next, u32 size)
PutMemBlockHeader: ; 8000988 PutMemBlockHeader: @ 8000988
push {r4,lr} push {r4,lr}
movs r4, 0 movs r4, 0
strh r4, [r0] strh r4, [r0]
@@ -16,8 +16,8 @@ PutMemBlockHeader: ; 8000988
thumb_func_end PutMemBlockHeader thumb_func_end PutMemBlockHeader
thumb_func_start PutFirstMemBlockHeader thumb_func_start PutFirstMemBlockHeader
; void PutFirstMemBlockHeader(void *block, u32 size) @ void PutFirstMemBlockHeader(void *block, u32 size)
PutFirstMemBlockHeader: ; 80009A4 PutFirstMemBlockHeader: @ 80009A4
push {lr} push {lr}
adds r2, r0, 0 adds r2, r0, 0
adds r3, r1, 0 adds r3, r1, 0
@@ -29,8 +29,8 @@ PutFirstMemBlockHeader: ; 80009A4
thumb_func_end PutFirstMemBlockHeader thumb_func_end PutFirstMemBlockHeader
thumb_func_start AllocInternal thumb_func_start AllocInternal
; void *AllocInternal(struct MemBlock *head, u32 size) @ void *AllocInternal(struct MemBlock *head, u32 size)
AllocInternal: ; 80009B8 AllocInternal: @ 80009B8
push {r4-r6,lr} push {r4-r6,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r6, r4, 0 adds r6, r4, 0
@@ -91,8 +91,8 @@ _08000A18:
thumb_func_end AllocInternal thumb_func_end AllocInternal
thumb_func_start FreeInternal thumb_func_start FreeInternal
; void FreeInternal(void *heapStart, void *pointer) @ void FreeInternal(void *heapStart, void *pointer)
FreeInternal: ; 8000A20 FreeInternal: @ 8000A20
push {r4,r5,lr} push {r4,r5,lr}
cmp r1, 0 cmp r1, 0
beq _08000A7C beq _08000A7C
@@ -148,8 +148,8 @@ _08000A7C:
thumb_func_end FreeInternal thumb_func_end FreeInternal
thumb_func_start AllocZeroedInternal thumb_func_start AllocZeroedInternal
; void *AllocZeroedInternal(void *heapStart, u32 size) @ void *AllocZeroedInternal(void *heapStart, u32 size)
AllocZeroedInternal: ; 8000A84 AllocZeroedInternal: @ 8000A84
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x4 sub sp, 0x4
adds r4, r1, 0 adds r4, r1, 0
@@ -184,8 +184,8 @@ _08000AB8:
thumb_func_end AllocZeroedInternal thumb_func_end AllocZeroedInternal
thumb_func_start CheckMemBlockInternal thumb_func_start CheckMemBlockInternal
; bool8 CheckMemBlockInternal(struct MemBlock *head, struct MemBlock *node) @ bool8 CheckMemBlockInternal(struct MemBlock *head, struct MemBlock *node)
CheckMemBlockInternal: ; 8000AC4 CheckMemBlockInternal: @ 8000AC4
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r0, 0 adds r5, r0, 0
adds r3, r1, 0 adds r3, r1, 0
@@ -236,8 +236,8 @@ _08000B16:
thumb_func_end CheckMemBlockInternal thumb_func_end CheckMemBlockInternal
thumb_func_start InitHeap thumb_func_start InitHeap
; void InitHeap(void *heapStart, u32 heapSize) @ void InitHeap(void *heapStart, u32 heapSize)
InitHeap: ; 8000B1C InitHeap: @ 8000B1C
push {lr} push {lr}
ldr r2, =0x03000004 ldr r2, =0x03000004
str r0, [r2] str r0, [r2]
@@ -250,8 +250,8 @@ InitHeap: ; 8000B1C
thumb_func_end InitHeap thumb_func_end InitHeap
thumb_func_start Alloc thumb_func_start Alloc
; void *Alloc(u32 size) @ void *Alloc(u32 size)
Alloc: ; 8000B38 Alloc: @ 8000B38
push {lr} push {lr}
adds r1, r0, 0 adds r1, r0, 0
ldr r0, =0x03000004 ldr r0, =0x03000004
@@ -263,8 +263,8 @@ Alloc: ; 8000B38
thumb_func_end Alloc thumb_func_end Alloc
thumb_func_start AllocZeroed thumb_func_start AllocZeroed
; void *AllocZeroed(u32 size) @ void *AllocZeroed(u32 size)
AllocZeroed: ; 8000B4C AllocZeroed: @ 8000B4C
push {lr} push {lr}
adds r1, r0, 0 adds r1, r0, 0
ldr r0, =0x03000004 ldr r0, =0x03000004
@@ -276,8 +276,8 @@ AllocZeroed: ; 8000B4C
thumb_func_end AllocZeroed thumb_func_end AllocZeroed
thumb_func_start Free thumb_func_start Free
; void Free(void *pointer) @ void Free(void *pointer)
Free: ; 8000B60 Free: @ 8000B60
push {lr} push {lr}
adds r1, r0, 0 adds r1, r0, 0
ldr r0, =0x03000004 ldr r0, =0x03000004
@@ -289,8 +289,8 @@ Free: ; 8000B60
thumb_func_end Free thumb_func_end Free
thumb_func_start CheckMemBlock thumb_func_start CheckMemBlock
; bool8 CheckMemBlock(void *pointer) @ bool8 CheckMemBlock(void *pointer)
CheckMemBlock: ; 8000B74 CheckMemBlock: @ 8000B74
push {lr} push {lr}
adds r1, r0, 0 adds r1, r0, 0
ldr r0, =0x03000004 ldr r0, =0x03000004
@@ -302,8 +302,8 @@ CheckMemBlock: ; 8000B74
thumb_func_end CheckMemBlock thumb_func_end CheckMemBlock
thumb_func_start CheckHeap thumb_func_start CheckHeap
; bool8 CheckHeap() @ bool8 CheckHeap()
CheckHeap: ; 8000B88 CheckHeap: @ 8000B88
push {r4,r5,lr} push {r4,r5,lr}
ldr r0, =0x03000004 ldr r0, =0x03000004
ldr r4, [r0] ldr r4, [r0]
asm/multiboot.s
+18 -18
View File
@@ -1,6 +1,6 @@
thumb_func_start MultiBootInit thumb_func_start MultiBootInit
; void MultiBootInit(MultiBootParam *mp) @ void MultiBootInit(MultiBootParam *mp)
MultiBootInit: ; 81BA6D0 MultiBootInit: @ 81BA6D0
adds r2, r0, 0 adds r2, r0, 0
movs r1, 0 movs r1, 0
strb r1, [r2, 0x1E] strb r1, [r2, 0x1E]
@@ -27,8 +27,8 @@ MultiBootInit: ; 81BA6D0
thumb_func_end MultiBootInit thumb_func_end MultiBootInit
thumb_func_start MultiBootMain thumb_func_start MultiBootMain
; int MultiBootMain(MultiBootParam *mp) @ int MultiBootMain(MultiBootParam *mp)
MultiBootMain: ; 81BA70C MultiBootMain: @ 81BA70C
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -544,8 +544,8 @@ _081BAAEC:
thumb_func_end MultiBootMain thumb_func_end MultiBootMain
thumb_func_start MultiBootSend thumb_func_start MultiBootSend
; int MultiBootSend(MultiBootParam *mp, u16 data) @ int MultiBootSend(MultiBootParam *mp, u16 data)
MultiBootSend: ; 81BAAFC MultiBootSend: @ 81BAAFC
push {r4,lr} push {r4,lr}
adds r2, r0, 0 adds r2, r0, 0
lsls r1, 16 lsls r1, 16
@@ -581,8 +581,8 @@ _081BAB40:
thumb_func_end MultiBootSend thumb_func_end MultiBootSend
thumb_func_start MultiBootStartProbe thumb_func_start MultiBootStartProbe
; void MultiBootStartProbe(MultiBootParam *mp) @ void MultiBootStartProbe(MultiBootParam *mp)
MultiBootStartProbe: ; 81BAB48 MultiBootStartProbe: @ 81BAB48
push {lr} push {lr}
adds r1, r0, 0 adds r1, r0, 0
ldrb r0, [r1, 0x18] ldrb r0, [r1, 0x18]
@@ -604,8 +604,8 @@ _081BAB66:
thumb_func_end MultiBootStartProbe thumb_func_end MultiBootStartProbe
thumb_func_start MultiBootStartMaster thumb_func_start MultiBootStartMaster
; void MultiBootStartMaster(MultiBootParam *mp, u8 *srcp, int length, u8 palette_color, s8 palette_speed) @ void MultiBootStartMaster(MultiBootParam *mp, u8 *srcp, int length, u8 palette_color, s8 palette_speed)
MultiBootStartMaster: ; 81BAB6C MultiBootStartMaster: @ 81BAB6C
push {r4-r7,lr} push {r4-r7,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r6, r1, 0 adds r6, r1, 0
@@ -703,8 +703,8 @@ _081BAC28:
thumb_func_end MultiBootStartMaster thumb_func_end MultiBootStartMaster
thumb_func_start MultiBootCheckComplete thumb_func_start MultiBootCheckComplete
; s32 MultiBootCheckComplete(MultiBootParam *mp) @ s32 MultiBootCheckComplete(MultiBootParam *mp)
MultiBootCheckComplete: ; 81BAC30 MultiBootCheckComplete: @ 81BAC30
push {lr} push {lr}
ldrb r0, [r0, 0x18] ldrb r0, [r0, 0x18]
cmp r0, 0xE9 cmp r0, 0xE9
@@ -719,8 +719,8 @@ _081BAC3E:
thumb_func_end MultiBootCheckComplete thumb_func_end MultiBootCheckComplete
thumb_func_start MultiBootHandShake thumb_func_start MultiBootHandShake
; int MultiBootHandShake(MultiBootParam *mp) @ int MultiBootHandShake(MultiBootParam *mp)
MultiBootHandShake: ; 81BAC44 MultiBootHandShake: @ 81BAC44
push {r4-r6,lr} push {r4-r6,lr}
adds r3, r0, 0 adds r3, r0, 0
ldrb r0, [r3, 0x18] ldrb r0, [r3, 0x18]
@@ -847,8 +847,8 @@ _081BAD28:
thumb_func_end MultiBootHandShake thumb_func_end MultiBootHandShake
thumb_func_start MultiBootWaitCycles thumb_func_start MultiBootWaitCycles
; void MultiBootWaitCycles(u32 cycles) @ void MultiBootWaitCycles(u32 cycles)
MultiBootWaitCycles: ; 81BAD30 MultiBootWaitCycles: @ 81BAD30
mov r2, pc mov r2, pc
lsrs r2, 24 lsrs r2, 24
movs r1, 0xC movs r1, 0xC
@@ -865,8 +865,8 @@ _081BAD42:
thumb_func_end MultiBootWaitCycles thumb_func_end MultiBootWaitCycles
thumb_func_start MultiBootWaitSendDone thumb_func_start MultiBootWaitSendDone
; void MultiBootWaitSendDone(void) @ void MultiBootWaitSendDone(void)
MultiBootWaitSendDone: ; 81BAD48 MultiBootWaitSendDone: @ 81BAD48
push {r4,r5,lr} push {r4,r5,lr}
movs r2, 0 movs r2, 0
ldr r3, =0x04000128 ldr r3, =0x04000128
asm/pixel_buffer.s
+10 -10
View File
@@ -1,6 +1,6 @@
thumb_func_start BlitBitmapRect4BitWithoutColorKey thumb_func_start BlitBitmapRect4BitWithoutColorKey
; void BlitBitmapRect4BitWithoutColorKey(struct Bitmap *src, struct Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height) @ void BlitBitmapRect4BitWithoutColorKey(struct Bitmap *src, struct Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height)
BlitBitmapRect4BitWithoutColorKey: ; 8002BDC BlitBitmapRect4BitWithoutColorKey: @ 8002BDC
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -37,8 +37,8 @@ BlitBitmapRect4BitWithoutColorKey: ; 8002BDC
thumb_func_end BlitBitmapRect4BitWithoutColorKey thumb_func_end BlitBitmapRect4BitWithoutColorKey
thumb_func_start BlitBitmapRect4Bit thumb_func_start BlitBitmapRect4Bit
; void BlitBitmapRect4Bit(struct Bitmap *src, struct Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height, u8 colorKey) @ void BlitBitmapRect4Bit(struct Bitmap *src, struct Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height, u8 colorKey)
BlitBitmapRect4Bit: ; 8002C20 BlitBitmapRect4Bit: @ 8002C20
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -292,8 +292,8 @@ _08002DEE:
thumb_func_end BlitBitmapRect4Bit thumb_func_end BlitBitmapRect4Bit
thumb_func_start FillBitmapRect4Bit thumb_func_start FillBitmapRect4Bit
; void FillBitmapRect4Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue) @ void FillBitmapRect4Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue)
FillBitmapRect4Bit: ; 8002E00 FillBitmapRect4Bit: @ 8002E00
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -404,8 +404,8 @@ _08002EB6:
thumb_func_end FillBitmapRect4Bit thumb_func_end FillBitmapRect4Bit
thumb_func_start BlitBitmapRect4BitTo8Bit thumb_func_start BlitBitmapRect4BitTo8Bit
; void BlitBitmapRect4BitTo8Bit(struct Bitmap *src, struct Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height, u8 colorKey, u8 paletteOffset) @ void BlitBitmapRect4BitTo8Bit(struct Bitmap *src, struct Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height, u8 colorKey, u8 paletteOffset)
BlitBitmapRect4BitTo8Bit: ; 8002EC8 BlitBitmapRect4BitTo8Bit: @ 8002EC8
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -721,8 +721,8 @@ _08003106:
thumb_func_end BlitBitmapRect4BitTo8Bit thumb_func_end BlitBitmapRect4BitTo8Bit
thumb_func_start FillBitmapRect8Bit thumb_func_start FillBitmapRect8Bit
; void FillBitmapRect8Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue) @ void FillBitmapRect8Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue)
FillBitmapRect8Bit: ; 8003118 FillBitmapRect8Bit: @ 8003118
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
asm/rtc.s
+52 -52
View File
@@ -1,6 +1,6 @@
thumb_func_start GameFreakRTC_ClearIME thumb_func_start GameFreakRTC_ClearIME
; void GameFreakRTC_ClearIME() @ void GameFreakRTC_ClearIME()
GameFreakRTC_ClearIME: ; 802F0CC GameFreakRTC_ClearIME: @ 802F0CC
ldr r2, =0x03000dce ldr r2, =0x03000dce
ldr r1, =0x04000208 ldr r1, =0x04000208
ldrh r0, [r1] ldrh r0, [r1]
@@ -12,8 +12,8 @@ GameFreakRTC_ClearIME: ; 802F0CC
thumb_func_end GameFreakRTC_ClearIME thumb_func_end GameFreakRTC_ClearIME
thumb_func_start GameFreakRTC_RestoreIME thumb_func_start GameFreakRTC_RestoreIME
; void GameFreakRTC_RestoreIME() @ void GameFreakRTC_RestoreIME()
GameFreakRTC_RestoreIME: ; 802F0E4 GameFreakRTC_RestoreIME: @ 802F0E4
ldr r0, =0x04000208 ldr r0, =0x04000208
ldr r1, =0x03000dce ldr r1, =0x03000dce
ldrh r1, [r1] ldrh r1, [r1]
@@ -23,8 +23,8 @@ GameFreakRTC_RestoreIME: ; 802F0E4
thumb_func_end GameFreakRTC_RestoreIME thumb_func_end GameFreakRTC_RestoreIME
thumb_func_start GameFreakRTC_ConvertFromBCD thumb_func_start GameFreakRTC_ConvertFromBCD
; u8 GameFreakRTC_ConvertFromBCD(u8 bcdByte) @ u8 GameFreakRTC_ConvertFromBCD(u8 bcdByte)
GameFreakRTC_ConvertFromBCD: ; 802F0F8 GameFreakRTC_ConvertFromBCD: @ 802F0F8
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
@@ -51,8 +51,8 @@ _0802F11C:
thumb_func_end GameFreakRTC_ConvertFromBCD thumb_func_end GameFreakRTC_ConvertFromBCD
thumb_func_start GameFreakRTC_IsLeapYear thumb_func_start GameFreakRTC_IsLeapYear
; bool8 GameFreakRTC_IsLeapYear(u32 year) @ bool8 GameFreakRTC_IsLeapYear(u32 year)
GameFreakRTC_IsLeapYear: ; 802F120 GameFreakRTC_IsLeapYear: @ 802F120
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r0, 0x3 movs r0, 0x3
@@ -83,8 +83,8 @@ _0802F14C:
thumb_func_end GameFreakRTC_IsLeapYear thumb_func_end GameFreakRTC_IsLeapYear
thumb_func_start GameFreakRTC_ConvertYearMonthDayToNumDays thumb_func_start GameFreakRTC_ConvertYearMonthDayToNumDays
; u16 GameFreakRTC_ConvertYearMonthDayToNumDays(u8 year, u8 month, u8 dayOfMonth) @ u16 GameFreakRTC_ConvertYearMonthDayToNumDays(u8 year, u8 month, u8 dayOfMonth)
GameFreakRTC_ConvertYearMonthDayToNumDays: ; 802F154 GameFreakRTC_ConvertYearMonthDayToNumDays: @ 802F154
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -158,8 +158,8 @@ _0802F1C2:
thumb_func_end GameFreakRTC_ConvertYearMonthDayToNumDays thumb_func_end GameFreakRTC_ConvertYearMonthDayToNumDays
thumb_func_start GameFreakRTC_GetNumDaysInternal thumb_func_start GameFreakRTC_GetNumDaysInternal
; u16 GameFreakRTC_GetNumDaysInternal(struct RTCInfo *rtc) @ u16 GameFreakRTC_GetNumDaysInternal(struct RTCInfo *rtc)
GameFreakRTC_GetNumDaysInternal: ; 802F1E0 GameFreakRTC_GetNumDaysInternal: @ 802F1E0
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r0, 0 adds r6, r0, 0
ldrb r0, [r6] ldrb r0, [r6]
@@ -188,8 +188,8 @@ GameFreakRTC_GetNumDaysInternal: ; 802F1E0
thumb_func_end GameFreakRTC_GetNumDaysInternal thumb_func_end GameFreakRTC_GetNumDaysInternal
thumb_func_start GameFreakRTC_Init thumb_func_start GameFreakRTC_Init
; void GameFreakRTC_Init() @ void GameFreakRTC_Init()
GameFreakRTC_Init: ; 802F21C GameFreakRTC_Init: @ 802F21C
push {r4,r5,lr} push {r4,r5,lr}
ldr r5, =0x03000db8 ldr r5, =0x03000db8
movs r0, 0 movs r0, 0
@@ -232,8 +232,8 @@ _0802F26E:
thumb_func_end GameFreakRTC_Init thumb_func_end GameFreakRTC_Init
thumb_func_start GameFreakRTC_GetErrorFlags thumb_func_start GameFreakRTC_GetErrorFlags
; u16 GameFreakRTC_GetErrorFlags() @ u16 GameFreakRTC_GetErrorFlags()
GameFreakRTC_GetErrorFlags: ; 802F27C GameFreakRTC_GetErrorFlags: @ 802F27C
ldr r0, =0x03000db8 ldr r0, =0x03000db8
ldrh r0, [r0] ldrh r0, [r0]
bx lr bx lr
@@ -241,8 +241,8 @@ GameFreakRTC_GetErrorFlags: ; 802F27C
thumb_func_end GameFreakRTC_GetErrorFlags thumb_func_end GameFreakRTC_GetErrorFlags
thumb_func_start GameFreakRTC_GetRTCDateTime thumb_func_start GameFreakRTC_GetRTCDateTime
; void GameFreakRTC_GetRTCDateTime(struct RTCInfo *rtc) @ void GameFreakRTC_GetRTCDateTime(struct RTCInfo *rtc)
GameFreakRTC_GetRTCDateTime: ; 802F288 GameFreakRTC_GetRTCDateTime: @ 802F288
push {r4,lr} push {r4,lr}
adds r2, r0, 0 adds r2, r0, 0
ldr r0, =0x03000db8 ldr r0, =0x03000db8
@@ -268,8 +268,8 @@ _0802F2B2:
thumb_func_end GameFreakRTC_GetRTCDateTime thumb_func_end GameFreakRTC_GetRTCDateTime
thumb_func_start GameFreakRTC_GetRTCDateTimeInternal thumb_func_start GameFreakRTC_GetRTCDateTimeInternal
; void GameFreakRTC_GetRTCDateTimeInternal(struct RTCInfo *rtc) @ void GameFreakRTC_GetRTCDateTimeInternal(struct RTCInfo *rtc)
GameFreakRTC_GetRTCDateTimeInternal: ; 802F2B8 GameFreakRTC_GetRTCDateTimeInternal: @ 802F2B8
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl GameFreakRTC_ClearIME bl GameFreakRTC_ClearIME
@@ -282,8 +282,8 @@ GameFreakRTC_GetRTCDateTimeInternal: ; 802F2B8
thumb_func_end GameFreakRTC_GetRTCDateTimeInternal thumb_func_end GameFreakRTC_GetRTCDateTimeInternal
thumb_func_start GameFreakRTC_GetControlReg thumb_func_start GameFreakRTC_GetControlReg
; void GameFreakRTC_GetControlReg(struct RTCInfo *rtc) @ void GameFreakRTC_GetControlReg(struct RTCInfo *rtc)
GameFreakRTC_GetControlReg: ; 802F2D0 GameFreakRTC_GetControlReg: @ 802F2D0
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl GameFreakRTC_ClearIME bl GameFreakRTC_ClearIME
@@ -296,8 +296,8 @@ GameFreakRTC_GetControlReg: ; 802F2D0
thumb_func_end GameFreakRTC_GetControlReg thumb_func_end GameFreakRTC_GetControlReg
thumb_func_start GameFreakRTC_GetControlRegAndRTCDateTime thumb_func_start GameFreakRTC_GetControlRegAndRTCDateTime
; void GameFreakRTC_GetControlRegAndRTCDateTime(struct RTCInfo *rtc) @ void GameFreakRTC_GetControlRegAndRTCDateTime(struct RTCInfo *rtc)
GameFreakRTC_GetControlRegAndRTCDateTime: ; 802F2E8 GameFreakRTC_GetControlRegAndRTCDateTime: @ 802F2E8
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl GameFreakRTC_GetControlReg bl GameFreakRTC_GetControlReg
@@ -309,8 +309,8 @@ GameFreakRTC_GetControlRegAndRTCDateTime: ; 802F2E8
thumb_func_end GameFreakRTC_GetControlRegAndRTCDateTime thumb_func_end GameFreakRTC_GetControlRegAndRTCDateTime
thumb_func_start GameFreakRTC_TestForErrors thumb_func_start GameFreakRTC_TestForErrors
; u16 GameFreakRTC_TestForErrors(struct RTCInfo *rtc) @ u16 GameFreakRTC_TestForErrors(struct RTCInfo *rtc)
GameFreakRTC_TestForErrors: ; 802F2FC GameFreakRTC_TestForErrors: @ 802F2FC
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -441,8 +441,8 @@ _0802F3E6:
thumb_func_end GameFreakRTC_TestForErrors thumb_func_end GameFreakRTC_TestForErrors
thumb_func_start GameFreakRTC_Reset thumb_func_start GameFreakRTC_Reset
; void GameFreakRTC_Reset() @ void GameFreakRTC_Reset()
GameFreakRTC_Reset: ; 802F3F8 GameFreakRTC_Reset: @ 802F3F8
push {lr} push {lr}
bl GameFreakRTC_ClearIME bl GameFreakRTC_ClearIME
bl RTC_Reset bl RTC_Reset
@@ -452,8 +452,8 @@ GameFreakRTC_Reset: ; 802F3F8
thumb_func_end GameFreakRTC_Reset thumb_func_end GameFreakRTC_Reset
thumb_func_start GameFreakRTC_FormatDecimalTimeString thumb_func_start GameFreakRTC_FormatDecimalTimeString
; void GameFreakRTC_FormatDecimalTimeString(u8 *dest, s32 hour, s32 minute, s32 second) @ void GameFreakRTC_FormatDecimalTimeString(u8 *dest, s32 hour, s32 minute, s32 second)
GameFreakRTC_FormatDecimalTimeString: ; 802F40C GameFreakRTC_FormatDecimalTimeString: @ 802F40C
push {r4-r6,lr} push {r4-r6,lr}
adds r5, r2, 0 adds r5, r2, 0
adds r6, r3, 0 adds r6, r3, 0
@@ -481,8 +481,8 @@ GameFreakRTC_FormatDecimalTimeString: ; 802F40C
thumb_func_end GameFreakRTC_FormatDecimalTimeString thumb_func_end GameFreakRTC_FormatDecimalTimeString
thumb_func_start GameFreakRTC_FormatHexTimeString thumb_func_start GameFreakRTC_FormatHexTimeString
; void GameFreakRTC_FormatHexTimeString(u8 *dest, s32 hour, s32 minute, s32 second) @ void GameFreakRTC_FormatHexTimeString(u8 *dest, s32 hour, s32 minute, s32 second)
GameFreakRTC_FormatHexTimeString: ; 802F444 GameFreakRTC_FormatHexTimeString: @ 802F444
push {r4-r6,lr} push {r4-r6,lr}
adds r5, r2, 0 adds r5, r2, 0
adds r6, r3, 0 adds r6, r3, 0
@@ -510,8 +510,8 @@ GameFreakRTC_FormatHexTimeString: ; 802F444
thumb_func_end GameFreakRTC_FormatHexTimeString thumb_func_end GameFreakRTC_FormatHexTimeString
thumb_func_start GameFreakRTC_FormatHexTimeStringFromRTCInfo thumb_func_start GameFreakRTC_FormatHexTimeStringFromRTCInfo
; void GameFreakRTC_FormatHexTimeStringFromRTCInfo() @ void GameFreakRTC_FormatHexTimeStringFromRTCInfo()
GameFreakRTC_FormatHexTimeStringFromRTCInfo: ; 802F47C GameFreakRTC_FormatHexTimeStringFromRTCInfo: @ 802F47C
push {lr} push {lr}
ldr r3, =0x03000dc0 ldr r3, =0x03000dc0
ldrb r1, [r3, 0x4] ldrb r1, [r3, 0x4]
@@ -524,8 +524,8 @@ GameFreakRTC_FormatHexTimeStringFromRTCInfo: ; 802F47C
thumb_func_end GameFreakRTC_FormatHexTimeStringFromRTCInfo thumb_func_end GameFreakRTC_FormatHexTimeStringFromRTCInfo
thumb_func_start GameFreakRTC_FormatDecimalYearMonthDayString thumb_func_start GameFreakRTC_FormatDecimalYearMonthDayString
; void GameFreakRTC_FormatDecimalYearMonthDayString(u8 *dest, s32 year, s32 month, s32 dayOfMonth) @ void GameFreakRTC_FormatDecimalYearMonthDayString(u8 *dest, s32 year, s32 month, s32 dayOfMonth)
GameFreakRTC_FormatDecimalYearMonthDayString: ; 802F494 GameFreakRTC_FormatDecimalYearMonthDayString: @ 802F494
push {r4-r6,lr} push {r4-r6,lr}
adds r5, r2, 0 adds r5, r2, 0
adds r6, r3, 0 adds r6, r3, 0
@@ -553,8 +553,8 @@ GameFreakRTC_FormatDecimalYearMonthDayString: ; 802F494
thumb_func_end GameFreakRTC_FormatDecimalYearMonthDayString thumb_func_end GameFreakRTC_FormatDecimalYearMonthDayString
thumb_func_start GameFreakRTC_FormatHexYearMonthDayString thumb_func_start GameFreakRTC_FormatHexYearMonthDayString
; void GameFreakRTC_FormatHexYearMonthDayString(u8 *dest, s32 year, s32 month, s32 dayOfMonth) @ void GameFreakRTC_FormatHexYearMonthDayString(u8 *dest, s32 year, s32 month, s32 dayOfMonth)
GameFreakRTC_FormatHexYearMonthDayString: ; 802F4CC GameFreakRTC_FormatHexYearMonthDayString: @ 802F4CC
push {r4-r6,lr} push {r4-r6,lr}
adds r5, r2, 0 adds r5, r2, 0
adds r6, r3, 0 adds r6, r3, 0
@@ -582,8 +582,8 @@ GameFreakRTC_FormatHexYearMonthDayString: ; 802F4CC
thumb_func_end GameFreakRTC_FormatHexYearMonthDayString thumb_func_end GameFreakRTC_FormatHexYearMonthDayString
thumb_func_start GameFreakRTC_GetRTCDelta thumb_func_start GameFreakRTC_GetRTCDelta
; void GameFreakRTC_GetRTCDelta(RTCInfo *rtc, GameDateTime *delta, GameDateTime *dateTime) @ void GameFreakRTC_GetRTCDelta(RTCInfo *rtc, GameDateTime *delta, GameDateTime *dateTime)
GameFreakRTC_GetRTCDelta: ; 802F504 GameFreakRTC_GetRTCDelta: @ 802F504
push {r4-r7,lr} push {r4-r7,lr}
adds r5, r0, 0 adds r5, r0, 0
adds r7, r1, 0 adds r7, r1, 0
@@ -652,8 +652,8 @@ _0802F582:
thumb_func_end GameFreakRTC_GetRTCDelta thumb_func_end GameFreakRTC_GetRTCDelta
thumb_func_start GameFreakRTC_CalcLocalDateTime thumb_func_start GameFreakRTC_CalcLocalDateTime
; void GameFreakRTC_CalcLocalDateTime() @ void GameFreakRTC_CalcLocalDateTime()
GameFreakRTC_CalcLocalDateTime: ; 802F588 GameFreakRTC_CalcLocalDateTime: @ 802F588
push {r4,lr} push {r4,lr}
ldr r4, =0x03000dc0 ldr r4, =0x03000dc0
adds r0, r4, 0 adds r0, r4, 0
@@ -671,8 +671,8 @@ GameFreakRTC_CalcLocalDateTime: ; 802F588
thumb_func_end GameFreakRTC_CalcLocalDateTime thumb_func_end GameFreakRTC_CalcLocalDateTime
thumb_func_start GameFreakRTC_CalcRTCToLocalDelta_DayZero thumb_func_start GameFreakRTC_CalcRTCToLocalDelta_DayZero
; void GameFreakRTC_CalcRTCToLocalDelta_DayZero(u8 hour, u8 minute) @ void GameFreakRTC_CalcRTCToLocalDelta_DayZero(u8 hour, u8 minute)
GameFreakRTC_CalcRTCToLocalDelta_DayZero: ; 802F5B4 GameFreakRTC_CalcRTCToLocalDelta_DayZero: @ 802F5B4
push {lr} push {lr}
adds r3, r0, 0 adds r3, r0, 0
adds r2, r1, 0 adds r2, r1, 0
@@ -685,8 +685,8 @@ GameFreakRTC_CalcRTCToLocalDelta_DayZero: ; 802F5B4
thumb_func_end GameFreakRTC_CalcRTCToLocalDelta_DayZero thumb_func_end GameFreakRTC_CalcRTCToLocalDelta_DayZero
thumb_func_start GameFreakRTC_CalcRTCToLocalDelta thumb_func_start GameFreakRTC_CalcRTCToLocalDelta
; void GameFreakRTC_CalcRTCToLocalDelta(u16 numDays, u8 hour, u8 minute, u8 second) @ void GameFreakRTC_CalcRTCToLocalDelta(u16 numDays, u8 hour, u8 minute, u8 second)
GameFreakRTC_CalcRTCToLocalDelta: ; 802F5C8 GameFreakRTC_CalcRTCToLocalDelta: @ 802F5C8
push {r4,r5,lr} push {r4,r5,lr}
ldr r4, =0x03005cf8 ldr r4, =0x03005cf8
strh r0, [r4] strh r0, [r4]
@@ -709,8 +709,8 @@ GameFreakRTC_CalcRTCToLocalDelta: ; 802F5C8
thumb_func_end GameFreakRTC_CalcRTCToLocalDelta thumb_func_end GameFreakRTC_CalcRTCToLocalDelta
thumb_func_start GameFreakRTC_GetDelta thumb_func_start GameFreakRTC_GetDelta
; void GameFreakRTC_GetDelta(GameDateTime *delta, GameDateTime *dateTime1, GameDateTime *dateTime2) @ void GameFreakRTC_GetDelta(GameDateTime *delta, GameDateTime *dateTime1, GameDateTime *dateTime2)
GameFreakRTC_GetDelta: ; 802F5FC GameFreakRTC_GetDelta: @ 802F5FC
push {r4-r6,lr} push {r4-r6,lr}
adds r4, r0, 0 adds r4, r0, 0
ldrb r3, [r2, 0x4] ldrb r3, [r2, 0x4]
@@ -768,8 +768,8 @@ _0802F65C:
thumb_func_end GameFreakRTC_GetDelta thumb_func_end GameFreakRTC_GetDelta
thumb_func_start GameFreakRTC_GetNumMinutes thumb_func_start GameFreakRTC_GetNumMinutes
; u16 GameFreakRTC_GetNumMinutes() @ u16 GameFreakRTC_GetNumMinutes()
GameFreakRTC_GetNumMinutes: ; 802F664 GameFreakRTC_GetNumMinutes: @ 802F664
push {r4,lr} push {r4,lr}
ldr r4, =0x03000dc0 ldr r4, =0x03000dc0
adds r0, r4, 0 adds r0, r4, 0
@@ -797,8 +797,8 @@ GameFreakRTC_GetNumMinutes: ; 802F664
thumb_func_end GameFreakRTC_GetNumMinutes thumb_func_end GameFreakRTC_GetNumMinutes
thumb_func_start GameFreakRTC_GetNumDays thumb_func_start GameFreakRTC_GetNumDays
; u16 GameFreakRTC_GetNumDays() @ u16 GameFreakRTC_GetNumDays()
GameFreakRTC_GetNumDays: ; 802F69C GameFreakRTC_GetNumDays: @ 802F69C
push {lr} push {lr}
ldr r0, =0x03000dc0 ldr r0, =0x03000dc0
bl GameFreakRTC_GetNumDaysInternal bl GameFreakRTC_GetNumDaysInternal
asm/string_util.s
+88 -88
View File
@@ -1,6 +1,6 @@
thumb_func_start CopyString_Limit10 thumb_func_start CopyString_Limit10
; u8 *CopyString_Limit10(u8 *dest, u8 *src) @ u8 *CopyString_Limit10(u8 *dest, u8 *src)
CopyString_Limit10: ; 8008B10 CopyString_Limit10: @ 8008B10
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r5, 0xA movs r5, 0xA
@@ -32,8 +32,8 @@ _08008B3C:
thumb_func_end CopyString_Limit10 thumb_func_end CopyString_Limit10
thumb_func_start GetStringEnd_Limit7 thumb_func_start GetStringEnd_Limit7
; u8 *GetStringEnd_Limit7(u8 *s) @ u8 *GetStringEnd_Limit7(u8 *s)
GetStringEnd_Limit7: ; 8008B44 GetStringEnd_Limit7: @ 8008B44
push {r4,lr} push {r4,lr}
adds r3, r0, 0 adds r3, r0, 0
movs r4, 0xA movs r4, 0xA
@@ -61,8 +61,8 @@ _08008B68:
thumb_func_end GetStringEnd_Limit7 thumb_func_end GetStringEnd_Limit7
thumb_func_start CopyString_Limit7 thumb_func_start CopyString_Limit7
; u8 *CopyString_Limit7(u8 *dest, u8 *src) @ u8 *CopyString_Limit7(u8 *dest, u8 *src)
CopyString_Limit7: ; 8008B70 CopyString_Limit7: @ 8008B70
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r5, 0x7 movs r5, 0x7
@@ -92,8 +92,8 @@ _08008B98:
thumb_func_end CopyString_Limit7 thumb_func_end CopyString_Limit7
thumb_func_start CopyString thumb_func_start CopyString
; u8 *CopyString(u8 *dest, u8 *src) @ u8 *CopyString(u8 *dest, u8 *src)
CopyString: ; 8008BA0 CopyString: @ 8008BA0
push {lr} push {lr}
adds r3, r0, 0 adds r3, r0, 0
b _08008BAC b _08008BAC
@@ -114,8 +114,8 @@ _08008BAC:
thumb_func_end CopyString thumb_func_end CopyString
thumb_func_start AppendString thumb_func_start AppendString
; u8 *AppendString(u8 *dest, u8 *src) @ u8 *AppendString(u8 *dest, u8 *src)
AppendString: ; 8008BC0 AppendString: @ 8008BC0
push {lr} push {lr}
adds r2, r0, 0 adds r2, r0, 0
b _08008BC8 b _08008BC8
@@ -132,8 +132,8 @@ _08008BC8:
thumb_func_end AppendString thumb_func_end AppendString
thumb_func_start CopyString_LimitN thumb_func_start CopyString_LimitN
; u8 *CopyString_LimitN(u8 *dest, u8 *src, u8 n) @ u8 *CopyString_LimitN(u8 *dest, u8 *src, u8 n)
CopyString_LimitN: ; 8008BD8 CopyString_LimitN: @ 8008BD8
push {r4-r6,lr} push {r4-r6,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r6, r1, 0 adds r6, r1, 0
@@ -162,8 +162,8 @@ _08008BFE:
thumb_func_end CopyString_LimitN thumb_func_end CopyString_LimitN
thumb_func_start AppendString_LimitN thumb_func_start AppendString_LimitN
; u8 *AppendString_LimitN(u8 *dest, u8 *src, u8 n) @ u8 *AppendString_LimitN(u8 *dest, u8 *src, u8 n)
AppendString_LimitN: ; 8008C08 AppendString_LimitN: @ 8008C08
push {lr} push {lr}
adds r3, r0, 0 adds r3, r0, 0
lsls r2, 24 lsls r2, 24
@@ -182,8 +182,8 @@ _08008C14:
thumb_func_end AppendString_LimitN thumb_func_end AppendString_LimitN
thumb_func_start GetStringLength thumb_func_start GetStringLength
; u16 GetStringLength(u8 *s) @ u16 GetStringLength(u8 *s)
GetStringLength: ; 8008C24 GetStringLength: @ 8008C24
push {lr} push {lr}
adds r2, r0, 0 adds r2, r0, 0
movs r1, 0 movs r1, 0
@@ -205,8 +205,8 @@ _08008C3E:
thumb_func_end GetStringLength thumb_func_end GetStringLength
thumb_func_start CompareString thumb_func_start CompareString
; u8 CompareString(u8 *s1, u8 *s2) @ u8 CompareString(u8 *s1, u8 *s2)
CompareString: ; 8008C44 CompareString: @ 8008C44
push {lr} push {lr}
adds r2, r0, 0 adds r2, r0, 0
b _08008C56 b _08008C56
@@ -232,8 +232,8 @@ _08008C64:
thumb_func_end CompareString thumb_func_end CompareString
thumb_func_start CompareString_LimitN thumb_func_start CompareString_LimitN
; u8 CompareString_LimitN(u8 *s1, u8 *s2, u32 n) @ u8 CompareString_LimitN(u8 *s1, u8 *s2, u32 n)
CompareString_LimitN: ; 8008C68 CompareString_LimitN: @ 8008C68
push {r4,lr} push {r4,lr}
adds r3, r0, 0 adds r3, r0, 0
b _08008C80 b _08008C80
@@ -263,8 +263,8 @@ _08008C8E:
thumb_func_end CompareString_LimitN thumb_func_end CompareString_LimitN
thumb_func_start IsStringLengthLessThanN thumb_func_start IsStringLengthLessThanN
; bool8 IsStringLengthLessThanN(u8 *s, s32 n) @ bool8 IsStringLengthLessThanN(u8 *s, s32 n)
IsStringLengthLessThanN: ; 8008C94 IsStringLengthLessThanN: @ 8008C94
push {lr} push {lr}
adds r3, r0, 0 adds r3, r0, 0
movs r2, 0 movs r2, 0
@@ -293,8 +293,8 @@ _08008CBA:
thumb_func_end IsStringLengthLessThanN thumb_func_end IsStringLengthLessThanN
thumb_func_start ConvertIntToDecimalString thumb_func_start ConvertIntToDecimalString
; u8 *ConvertIntToDecimalString(u8 *dest, s32 value, u8 mode, u8 numDigits) @ u8 *ConvertIntToDecimalString(u8 *dest, s32 value, u8 mode, u8 numDigits)
ConvertIntToDecimalString: ; 8008CC0 ConvertIntToDecimalString: @ 8008CC0
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -392,8 +392,8 @@ _08008D60:
thumb_func_end ConvertIntToDecimalString thumb_func_end ConvertIntToDecimalString
thumb_func_start ConvertUnsignedIntToDecimalString thumb_func_start ConvertUnsignedIntToDecimalString
; u8 *ConvertUnsignedIntToDecimalString(u8 *dest, u32 value, u8 mode, u8 numDigits) @ u8 *ConvertUnsignedIntToDecimalString(u8 *dest, u32 value, u8 mode, u8 numDigits)
ConvertUnsignedIntToDecimalString: ; 8008D70 ConvertUnsignedIntToDecimalString: @ 8008D70
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -491,8 +491,8 @@ _08008E10:
thumb_func_end ConvertUnsignedIntToDecimalString thumb_func_end ConvertUnsignedIntToDecimalString
thumb_func_start ConvertIntToHexString thumb_func_start ConvertIntToHexString
; u8 *ConvertIntToHexString(u8 *dest, s32 value, u8 mode, u8 numDigits) @ u8 *ConvertIntToHexString(u8 *dest, s32 value, u8 mode, u8 numDigits)
ConvertIntToHexString: ; 8008E20 ConvertIntToHexString: @ 8008E20
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r9 mov r7, r9
mov r6, r8 mov r6, r8
@@ -601,8 +601,8 @@ _08008ECA:
thumb_func_end ConvertIntToHexString thumb_func_end ConvertIntToHexString
thumb_func_start ExpandStringRefs thumb_func_start ExpandStringRefs
; u8 *ExpandStringRefs(u8 *dest, u8 *src) @ u8 *ExpandStringRefs(u8 *dest, u8 *src)
ExpandStringRefs: ; 8008EE0 ExpandStringRefs: @ 8008EE0
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -705,8 +705,8 @@ _08008FC0:
thumb_func_end ExpandStringRefs thumb_func_end ExpandStringRefs
thumb_func_start sub_8008FCC thumb_func_start sub_8008FCC
; u8 *sub_8008FCC(u8 *dest, u8 *src) @ u8 *sub_8008FCC(u8 *dest, u8 *src)
sub_8008FCC: ; 8008FCC sub_8008FCC: @ 8008FCC
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0xC sub sp, 0xC
adds r5, r0, 0 adds r5, r0, 0
@@ -755,16 +755,16 @@ _0800901E:
thumb_func_end sub_8008FCC thumb_func_end sub_8008FCC
thumb_func_start StringRef_GetPossiblyUnusedStringVar thumb_func_start StringRef_GetPossiblyUnusedStringVar
; u8 *StringRef_GetPossiblyUnusedStringVar() @ u8 *StringRef_GetPossiblyUnusedStringVar()
StringRef_GetPossiblyUnusedStringVar: ; 800902C StringRef_GetPossiblyUnusedStringVar: @ 800902C
ldr r0, =0x020223ac ldr r0, =0x020223ac
bx lr bx lr
.pool .pool
thumb_func_end StringRef_GetPossiblyUnusedStringVar thumb_func_end StringRef_GetPossiblyUnusedStringVar
thumb_func_start StringRef_GetPlayerName thumb_func_start StringRef_GetPlayerName
; u8 *StringRef_GetPlayerName() @ u8 *StringRef_GetPlayerName()
StringRef_GetPlayerName: ; 8009034 StringRef_GetPlayerName: @ 8009034
ldr r0, =0x03005d90 ldr r0, =0x03005d90
ldr r0, [r0] ldr r0, [r0]
bx lr bx lr
@@ -772,32 +772,32 @@ StringRef_GetPlayerName: ; 8009034
thumb_func_end StringRef_GetPlayerName thumb_func_end StringRef_GetPlayerName
thumb_func_start StringRef_GetStringVar1 thumb_func_start StringRef_GetStringVar1
; u8 *StringRef_GetStringVar1() @ u8 *StringRef_GetStringVar1()
StringRef_GetStringVar1: ; 8009040 StringRef_GetStringVar1: @ 8009040
ldr r0, =0x02021cc4 ldr r0, =0x02021cc4
bx lr bx lr
.pool .pool
thumb_func_end StringRef_GetStringVar1 thumb_func_end StringRef_GetStringVar1
thumb_func_start StringRef_GetStringVar2 thumb_func_start StringRef_GetStringVar2
; u8 *StringRef_GetStringVar2() @ u8 *StringRef_GetStringVar2()
StringRef_GetStringVar2: ; 8009048 StringRef_GetStringVar2: @ 8009048
ldr r0, =0x02021dc4 ldr r0, =0x02021dc4
bx lr bx lr
.pool .pool
thumb_func_end StringRef_GetStringVar2 thumb_func_end StringRef_GetStringVar2
thumb_func_start StringRef_GetStringVar3 thumb_func_start StringRef_GetStringVar3
; u8 *StringRef_GetStringVar3() @ u8 *StringRef_GetStringVar3()
StringRef_GetStringVar3: ; 8009050 StringRef_GetStringVar3: @ 8009050
ldr r0, =0x02021ec4 ldr r0, =0x02021ec4
bx lr bx lr
.pool .pool
thumb_func_end StringRef_GetStringVar3 thumb_func_end StringRef_GetStringVar3
thumb_func_start StringRef_GetDummiedOutGenderDependentString thumb_func_start StringRef_GetDummiedOutGenderDependentString
; u8 *StringRef_GetDummiedOutGenderDependentString() @ u8 *StringRef_GetDummiedOutGenderDependentString()
StringRef_GetDummiedOutGenderDependentString: ; 8009058 StringRef_GetDummiedOutGenderDependentString: @ 8009058
push {lr} push {lr}
ldr r0, =0x03005d90 ldr r0, =0x03005d90
ldr r0, [r0] ldr r0, [r0]
@@ -816,8 +816,8 @@ _08009072:
thumb_func_end StringRef_GetDummiedOutGenderDependentString thumb_func_end StringRef_GetDummiedOutGenderDependentString
thumb_func_start StringRef_GetRivalName thumb_func_start StringRef_GetRivalName
; u8 *StringRef_GetRivalName() @ u8 *StringRef_GetRivalName()
StringRef_GetRivalName: ; 800907C StringRef_GetRivalName: @ 800907C
push {lr} push {lr}
ldr r0, =0x03005d90 ldr r0, =0x03005d90
ldr r0, [r0] ldr r0, [r0]
@@ -836,64 +836,64 @@ _08009096:
thumb_func_end StringRef_GetRivalName thumb_func_end StringRef_GetRivalName
thumb_func_start StringRef_GetEmeraldString thumb_func_start StringRef_GetEmeraldString
; u8 *StringRef_GetEmeraldString() @ u8 *StringRef_GetEmeraldString()
StringRef_GetEmeraldString: ; 80090A0 StringRef_GetEmeraldString: @ 80090A0
ldr r0, =gUnknown_085E8229 ldr r0, =gUnknown_085E8229
bx lr bx lr
.pool .pool
thumb_func_end StringRef_GetEmeraldString thumb_func_end StringRef_GetEmeraldString
thumb_func_start StringRef_GetAquaString thumb_func_start StringRef_GetAquaString
; u8 *StringRef_GetAquaString() @ u8 *StringRef_GetAquaString()
StringRef_GetAquaString: ; 80090A8 StringRef_GetAquaString: @ 80090A8
ldr r0, =gUnknown_085E8231 ldr r0, =gUnknown_085E8231
bx lr bx lr
.pool .pool
thumb_func_end StringRef_GetAquaString thumb_func_end StringRef_GetAquaString
thumb_func_start StringRef_GetMagmaString thumb_func_start StringRef_GetMagmaString
; u8 *StringRef_GetMagmaString() @ u8 *StringRef_GetMagmaString()
StringRef_GetMagmaString: ; 80090B0 StringRef_GetMagmaString: @ 80090B0
ldr r0, =gUnknown_085E8236 ldr r0, =gUnknown_085E8236
bx lr bx lr
.pool .pool
thumb_func_end StringRef_GetMagmaString thumb_func_end StringRef_GetMagmaString
thumb_func_start StringRef_GetArchieString thumb_func_start StringRef_GetArchieString
; u8 *StringRef_GetArchieString() @ u8 *StringRef_GetArchieString()
StringRef_GetArchieString: ; 80090B8 StringRef_GetArchieString: @ 80090B8
ldr r0, =gUnknown_085E823C ldr r0, =gUnknown_085E823C
bx lr bx lr
.pool .pool
thumb_func_end StringRef_GetArchieString thumb_func_end StringRef_GetArchieString
thumb_func_start StringRef_GetMaxieString thumb_func_start StringRef_GetMaxieString
; u8 *StringRef_GetMaxieString() @ u8 *StringRef_GetMaxieString()
StringRef_GetMaxieString: ; 80090C0 StringRef_GetMaxieString: @ 80090C0
ldr r0, =gUnknown_085E8243 ldr r0, =gUnknown_085E8243
bx lr bx lr
.pool .pool
thumb_func_end StringRef_GetMaxieString thumb_func_end StringRef_GetMaxieString
thumb_func_start StringRef_GetKyogreString thumb_func_start StringRef_GetKyogreString
; u8 *StringRef_GetKyogreString() @ u8 *StringRef_GetKyogreString()
StringRef_GetKyogreString: ; 80090C8 StringRef_GetKyogreString: @ 80090C8
ldr r0, =gUnknown_085E8249 ldr r0, =gUnknown_085E8249
bx lr bx lr
.pool .pool
thumb_func_end StringRef_GetKyogreString thumb_func_end StringRef_GetKyogreString
thumb_func_start StringRef_GetGroudonString thumb_func_start StringRef_GetGroudonString
; u8 *StringRef_GetGroudonString() @ u8 *StringRef_GetGroudonString()
StringRef_GetGroudonString: ; 80090D0 StringRef_GetGroudonString: @ 80090D0
ldr r0, =gUnknown_085E8250 ldr r0, =gUnknown_085E8250
bx lr bx lr
.pool .pool
thumb_func_end StringRef_GetGroudonString thumb_func_end StringRef_GetGroudonString
thumb_func_start GetExpandedStringRef thumb_func_start GetExpandedStringRef
; u8 *GetExpandedStringRef(u8 code) @ u8 *GetExpandedStringRef(u8 code)
GetExpandedStringRef: ; 80090D8 GetExpandedStringRef: @ 80090D8
push {lr} push {lr}
cmp r0, 0xD cmp r0, 0xD
bhi _080090F0 bhi _080090F0
@@ -913,8 +913,8 @@ _080090F2:
thumb_func_end GetExpandedStringRef thumb_func_end GetExpandedStringRef
thumb_func_start RepeatChar thumb_func_start RepeatChar
; u8 *RepeatChar(u8 *dest, u8 c, u16 n) @ u8 *RepeatChar(u8 *dest, u8 c, u16 n)
RepeatChar: ; 80090FC RepeatChar: @ 80090FC
push {lr} push {lr}
adds r3, r0, 0 adds r3, r0, 0
lsls r1, 24 lsls r1, 24
@@ -941,8 +941,8 @@ _0800911C:
thumb_func_end RepeatChar thumb_func_end RepeatChar
thumb_func_start CopyStringPadded thumb_func_start CopyStringPadded
; u8 *CopyStringPadded(u8 *dest, u8 *src, u8 c, u16 n) @ u8 *CopyStringPadded(u8 *dest, u8 *src, u8 c, u16 n)
CopyStringPadded: ; 8009128 CopyStringPadded: @ 8009128
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -991,8 +991,8 @@ _0800916C:
thumb_func_end CopyStringPadded thumb_func_end CopyStringPadded
thumb_func_start RepeatStringTerminator thumb_func_start RepeatStringTerminator
; u8 *RepeatStringTerminator(u8 *dest, u16 n) @ u8 *RepeatStringTerminator(u8 *dest, u16 n)
RepeatStringTerminator: ; 800917C RepeatStringTerminator: @ 800917C
push {lr} push {lr}
lsls r2, r1, 16 lsls r2, r1, 16
lsrs r2, 16 lsrs r2, 16
@@ -1003,8 +1003,8 @@ RepeatStringTerminator: ; 800917C
thumb_func_end RepeatStringTerminator thumb_func_end RepeatStringTerminator
thumb_func_start CopyString_LimitN_Multibyte thumb_func_start CopyString_LimitN_Multibyte
; u8 *CopyString_LimitN_Multibyte(u8 *dest, u8 *src, u32 n) @ u8 *CopyString_LimitN_Multibyte(u8 *dest, u8 *src, u32 n)
CopyString_LimitN_Multibyte: ; 800918C CopyString_LimitN_Multibyte: @ 800918C
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r3, r1, 0 adds r3, r1, 0
@@ -1043,8 +1043,8 @@ _080091BE:
thumb_func_end CopyString_LimitN_Multibyte thumb_func_end CopyString_LimitN_Multibyte
thumb_func_start GetStringLength_Multibyte thumb_func_start GetStringLength_Multibyte
; u32 GetStringLength_Multibyte(u8 *s) @ u32 GetStringLength_Multibyte(u8 *s)
GetStringLength_Multibyte: ; 80091CC GetStringLength_Multibyte: @ 80091CC
push {lr} push {lr}
adds r2, r0, 0 adds r2, r0, 0
movs r3, 0 movs r3, 0
@@ -1067,8 +1067,8 @@ _080091DE:
thumb_func_end GetStringLength_Multibyte thumb_func_end GetStringLength_Multibyte
thumb_func_start WriteColorChangeControlCode thumb_func_start WriteColorChangeControlCode
; u8 *WriteColorChangeControlCode(u8 *dest, u8 colorType, u8 color) @ u8 *WriteColorChangeControlCode(u8 *dest, u8 colorType, u8 color)
WriteColorChangeControlCode: ; 80091EC WriteColorChangeControlCode: @ 80091EC
push {lr} push {lr}
adds r3, r0, 0 adds r3, r0, 0
lsls r2, 24 lsls r2, 24
@@ -1106,8 +1106,8 @@ _08009218:
thumb_func_end WriteColorChangeControlCode thumb_func_end WriteColorChangeControlCode
thumb_func_start sub_8009228 thumb_func_start sub_8009228
; bool8 sub_8009228(u8 *s) @ bool8 sub_8009228(u8 *s)
sub_8009228: ; 8009228 sub_8009228: @ 8009228
push {lr} push {lr}
adds r2, r0, 0 adds r2, r0, 0
b _0800923E b _0800923E
@@ -1133,8 +1133,8 @@ _08009248:
thumb_func_end sub_8009228 thumb_func_end sub_8009228
thumb_func_start sub_800924C thumb_func_start sub_800924C
; bool8 sub_800924C(u8 *s, u32 n) @ bool8 sub_800924C(u8 *s, u32 n)
sub_800924C: ; 800924C sub_800924C: @ 800924C
push {r4,lr} push {r4,lr}
adds r3, r0, 0 adds r3, r0, 0
adds r4, r1, 0 adds r4, r1, 0
@@ -1167,8 +1167,8 @@ _08009276:
thumb_func_end sub_800924C thumb_func_end sub_800924C
thumb_func_start GetExtendedControlCodeLength thumb_func_start GetExtendedControlCodeLength
; u8 GetExtendedControlCodeLength(u8 code) @ u8 GetExtendedControlCodeLength(u8 code)
GetExtendedControlCodeLength: ; 800927C GetExtendedControlCodeLength: @ 800927C
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
@@ -1185,8 +1185,8 @@ _0800928E:
thumb_func_end GetExtendedControlCodeLength thumb_func_end GetExtendedControlCodeLength
thumb_func_start SkipExtendedControlCode thumb_func_start SkipExtendedControlCode
; u8 *SkipExtendedControlCode(u8 *s) @ u8 *SkipExtendedControlCode(u8 *s)
SkipExtendedControlCode: ; 8009298 SkipExtendedControlCode: @ 8009298
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
b _080092AC b _080092AC
@@ -1208,8 +1208,8 @@ _080092AC:
thumb_func_end SkipExtendedControlCode thumb_func_end SkipExtendedControlCode
thumb_func_start CompareStringWithoutExtendedControlCodes thumb_func_start CompareStringWithoutExtendedControlCodes
; u8 CompareStringWithoutExtendedControlCodes(u8 *s1, u8 *s2) @ u8 CompareStringWithoutExtendedControlCodes(u8 *s1, u8 *s2)
CompareStringWithoutExtendedControlCodes: ; 80092BC CompareStringWithoutExtendedControlCodes: @ 80092BC
push {r4-r6,lr} push {r4-r6,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -1252,8 +1252,8 @@ _080092FE:
thumb_func_end CompareStringWithoutExtendedControlCodes thumb_func_end CompareStringWithoutExtendedControlCodes
thumb_func_start StopMusicWhileStringIsPrinted thumb_func_start StopMusicWhileStringIsPrinted
; void StopMusicWhileStringIsPrinted(u8 *s, bool8 stopMusic) @ void StopMusicWhileStringIsPrinted(u8 *s, bool8 stopMusic)
StopMusicWhileStringIsPrinted: ; 8009308 StopMusicWhileStringIsPrinted: @ 8009308
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
lsls r1, 24 lsls r1, 24
@@ -1309,8 +1309,8 @@ _08009368:
thumb_func_end StopMusicWhileStringIsPrinted thumb_func_end StopMusicWhileStringIsPrinted
thumb_func_start StripExtendedControlCodes thumb_func_start StripExtendedControlCodes
; void StripExtendedControlCodes(u8 *s) @ void StripExtendedControlCodes(u8 *s)
StripExtendedControlCodes: ; 8009370 StripExtendedControlCodes: @ 8009370
push {r4-r6,lr} push {r4-r6,lr}
adds r5, r0, 0 adds r5, r0, 0
movs r4, 0 movs r4, 0
asm/task.s
+22 -22
View File
@@ -1,6 +1,6 @@
thumb_func_start clear_tasks thumb_func_start clear_tasks
; void clear_tasks() @ void clear_tasks()
clear_tasks: ; 80A8F50 clear_tasks: @ 80A8F50
push {r4-r7,lr} push {r4-r7,lr}
movs r4, 0 movs r4, 0
ldr r6, =0x03005e00 ldr r6, =0x03005e00
@@ -46,8 +46,8 @@ _080A8F5A:
thumb_func_end clear_tasks thumb_func_end clear_tasks
thumb_func_start AddTask thumb_func_start AddTask
; int AddTask(void ( *func)(int task_id), u8 priority) @ int AddTask(void ( *func)(int task_id), u8 priority)
AddTask: ; 80A8FB0 AddTask: @ 80A8FB0
push {r4-r7,lr} push {r4-r7,lr}
adds r2, r0, 0 adds r2, r0, 0
lsls r1, 24 lsls r1, 24
@@ -91,8 +91,8 @@ _080A8FFC:
thumb_func_end AddTask thumb_func_end AddTask
thumb_func_start insert_task_in_order_by_priority thumb_func_start insert_task_in_order_by_priority
; void insert_task_in_order_by_priority(int task_id) @ void insert_task_in_order_by_priority(int task_id)
insert_task_in_order_by_priority: ; 80A9004 insert_task_in_order_by_priority: @ 80A9004
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -173,8 +173,8 @@ _080A9090:
thumb_func_end insert_task_in_order_by_priority thumb_func_end insert_task_in_order_by_priority
thumb_func_start remove_task thumb_func_start remove_task
; void remove_task(int task_id) @ void remove_task(int task_id)
remove_task: ; 80A909C remove_task: @ 80A909C
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -236,8 +236,8 @@ _080A9106:
thumb_func_end remove_task thumb_func_end remove_task
thumb_func_start RunActiveTasks thumb_func_start RunActiveTasks
; void RunActiveTasks() @ void RunActiveTasks()
RunActiveTasks: ; 80A910C RunActiveTasks: @ 80A910C
push {r4,r5,lr} push {r4,r5,lr}
bl get_first_active_task bl get_first_active_task
lsls r0, 24 lsls r0, 24
@@ -263,8 +263,8 @@ _080A9130:
thumb_func_end RunActiveTasks thumb_func_end RunActiveTasks
thumb_func_start get_first_active_task thumb_func_start get_first_active_task
; int get_first_active_task() @ int get_first_active_task()
get_first_active_task: ; 80A913C get_first_active_task: @ 80A913C
push {lr} push {lr}
movs r2, 0 movs r2, 0
ldr r0, =0x03005e00 ldr r0, =0x03005e00
@@ -299,12 +299,12 @@ _080A916E:
thumb_func_end get_first_active_task thumb_func_end get_first_active_task
thumb_func_start nullsub_4 thumb_func_start nullsub_4
nullsub_4: ; 80A9178 nullsub_4: @ 80A9178
bx lr bx lr
thumb_func_end nullsub_4 thumb_func_end nullsub_4
thumb_func_start set_task_function_and_args_14_15 thumb_func_start set_task_function_and_args_14_15
set_task_function_and_args_14_15: ; 80A917C set_task_function_and_args_14_15: @ 80A917C
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -332,7 +332,7 @@ set_task_function_and_args_14_15: ; 80A917C
thumb_func_end set_task_function_and_args_14_15 thumb_func_end set_task_function_and_args_14_15
thumb_func_start set_task_function_to_args_14_15 thumb_func_start set_task_function_to_args_14_15
set_task_function_to_args_14_15: ; 80A91B0 set_task_function_to_args_14_15: @ 80A91B0
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -360,8 +360,8 @@ set_task_function_to_args_14_15: ; 80A91B0
thumb_func_end set_task_function_to_args_14_15 thumb_func_end set_task_function_to_args_14_15
thumb_func_start is_function_an_active_task thumb_func_start is_function_an_active_task
; int is_function_an_active_task(void ( *func)(int task_id)) @ int is_function_an_active_task(void ( *func)(int task_id))
is_function_an_active_task: ; 80A91E4 is_function_an_active_task: @ 80A91E4
push {r4,lr} push {r4,lr}
adds r3, r0, 0 adds r3, r0, 0
movs r2, 0 movs r2, 0
@@ -394,8 +394,8 @@ _080A9214:
thumb_func_end is_function_an_active_task thumb_func_end is_function_an_active_task
thumb_func_start get_task_id_by_function thumb_func_start get_task_id_by_function
; int get_task_id_by_function(void ( *func)(int task_id)) @ int get_task_id_by_function(void ( *func)(int task_id))
get_task_id_by_function: ; 80A921C get_task_id_by_function: @ 80A921C
push {lr} push {lr}
adds r3, r0, 0 adds r3, r0, 0
movs r2, 0 movs r2, 0
@@ -423,7 +423,7 @@ _080A9246:
thumb_func_end get_task_id_by_function thumb_func_end get_task_id_by_function
thumb_func_start sub_80A924C thumb_func_start sub_80A924C
sub_80A924C: ; 80A924C sub_80A924C: @ 80A924C
push {lr} push {lr}
movs r2, 0 movs r2, 0
movs r1, 0 movs r1, 0
@@ -452,7 +452,7 @@ _080A9268:
thumb_func_end sub_80A924C thumb_func_end sub_80A924C
thumb_func_start set_word_task_arg thumb_func_start set_word_task_arg
set_word_task_arg: ; 80A927C set_word_task_arg: @ 80A927C
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r2, 0 adds r5, r2, 0
lsls r0, 24 lsls r0, 24
@@ -484,7 +484,7 @@ _080A92AA:
thumb_func_end set_word_task_arg thumb_func_end set_word_task_arg
thumb_func_start get_word_task_arg thumb_func_start get_word_task_arg
get_word_task_arg: ; 80A92B4 get_word_task_arg: @ 80A92B4
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
asm/text_renderer.s
+104 -104
View File
@@ -1,6 +1,6 @@
thumb_func_start SetFontsPointer thumb_func_start SetFontsPointer
; void SetFontsPointer(struct FontInfo *fonts) @ void SetFontsPointer(struct FontInfo *fonts)
SetFontsPointer: ; 80045A4 SetFontsPointer: @ 80045A4
ldr r1, =0x03002f80 ldr r1, =0x03002f80
str r0, [r1] str r0, [r1]
bx lr bx lr
@@ -8,8 +8,8 @@ SetFontsPointer: ; 80045A4
thumb_func_end SetFontsPointer thumb_func_end SetFontsPointer
thumb_func_start DeactivateAllTextPrinters thumb_func_start DeactivateAllTextPrinters
; void DeactivateAllTextPrinters() @ void DeactivateAllTextPrinters()
DeactivateAllTextPrinters: ; 80045B0 DeactivateAllTextPrinters: @ 80045B0
push {lr} push {lr}
ldr r1, =0x020201b0 ldr r1, =0x020201b0
movs r2, 0 movs r2, 0
@@ -26,8 +26,8 @@ _080045BA:
thumb_func_end DeactivateAllTextPrinters thumb_func_end DeactivateAllTextPrinters
thumb_func_start Print thumb_func_start Print
; u16 Print(u8 windowId, u8 fontId, u8 *str, u8 x, u8 y, u8 speed, void ( *callback)(u16, struct TextPrinter *)) @ u16 Print(u8 windowId, u8 fontId, u8 *str, u8 x, u8 y, u8 speed, void ( *callback)(u16, struct TextPrinter *))
Print: ; 80045D0 Print: @ 80045D0
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -115,8 +115,8 @@ Print: ; 80045D0
thumb_func_end Print thumb_func_end Print
thumb_func_start AddTextPrinter thumb_func_start AddTextPrinter
; u16 AddTextPrinter(struct TextPrinter *textPrinter, u8 speed, void ( *callback)(u16, struct TextPrinter *)) @ u16 AddTextPrinter(struct TextPrinter *textPrinter, u8 speed, void ( *callback)(u16, struct TextPrinter *))
AddTextPrinter: ; 800467C AddTextPrinter: @ 800467C
push {r4-r7,lr} push {r4-r7,lr}
adds r6, r0, 0 adds r6, r0, 0
mov r12, r2 mov r12, r2
@@ -238,8 +238,8 @@ _08004766:
thumb_func_end AddTextPrinter thumb_func_end AddTextPrinter
thumb_func_start RunTextPrinters thumb_func_start RunTextPrinters
; void RunTextPrinters() @ void RunTextPrinters()
RunTextPrinters: ; 8004778 RunTextPrinters: @ 8004778
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -309,8 +309,8 @@ _080047F6:
thumb_func_end RunTextPrinters thumb_func_end RunTextPrinters
thumb_func_start IsTextPrinterActive thumb_func_start IsTextPrinterActive
; bool8 IsTextPrinterActive(u8 id) @ bool8 IsTextPrinterActive(u8 id)
IsTextPrinterActive: ; 8004800 IsTextPrinterActive: @ 8004800
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =0x020201b0 ldr r2, =0x020201b0
@@ -324,8 +324,8 @@ IsTextPrinterActive: ; 8004800
thumb_func_end IsTextPrinterActive thumb_func_end IsTextPrinterActive
thumb_func_start RenderFont thumb_func_start RenderFont
; u16 RenderFont(struct TextPrinter *textPrinter) @ u16 RenderFont(struct TextPrinter *textPrinter)
RenderFont: ; 8004818 RenderFont: @ 8004818
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
_0800481C: _0800481C:
@@ -350,8 +350,8 @@ _0800481C:
thumb_func_end RenderFont thumb_func_end RenderFont
thumb_func_start GenerateFontHalfRowLookupTable thumb_func_start GenerateFontHalfRowLookupTable
; void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor) @ void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor)
GenerateFontHalfRowLookupTable: ; 8004844 GenerateFontHalfRowLookupTable: @ 8004844
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -810,8 +810,8 @@ GenerateFontHalfRowLookupTable: ; 8004844
thumb_func_end GenerateFontHalfRowLookupTable thumb_func_end GenerateFontHalfRowLookupTable
thumb_func_start SaveTextColors thumb_func_start SaveTextColors
; void SaveTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor) @ void SaveTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor)
SaveTextColors: ; 8004BE0 SaveTextColors: @ 8004BE0
ldr r3, =0x030009ea ldr r3, =0x030009ea
ldrh r3, [r3] ldrh r3, [r3]
strb r3, [r1] strb r3, [r1]
@@ -826,8 +826,8 @@ SaveTextColors: ; 8004BE0
thumb_func_end SaveTextColors thumb_func_end SaveTextColors
thumb_func_start RestoreTextColors thumb_func_start RestoreTextColors
; void RestoreTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor) @ void RestoreTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor)
RestoreTextColors: ; 8004C00 RestoreTextColors: @ 8004C00
push {lr} push {lr}
ldrb r0, [r0] ldrb r0, [r0]
ldrb r1, [r1] ldrb r1, [r1]
@@ -838,8 +838,8 @@ RestoreTextColors: ; 8004C00
thumb_func_end RestoreTextColors thumb_func_end RestoreTextColors
thumb_func_start DecompressGlyphTile thumb_func_start DecompressGlyphTile
; void DecompressGlyphTile(u16 *src, u32 *dest) @ void DecompressGlyphTile(u16 *src, u32 *dest)
DecompressGlyphTile: ; 8004C10 DecompressGlyphTile: @ 8004C10
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -1003,8 +1003,8 @@ DecompressGlyphTile: ; 8004C10
thumb_func_end DecompressGlyphTile thumb_func_end DecompressGlyphTile
thumb_func_start GetLastTextColor thumb_func_start GetLastTextColor
; u8 GetLastTextColor(u8 colorType) @ u8 GetLastTextColor(u8 colorType)
GetLastTextColor: ; 8004D58 GetLastTextColor: @ 8004D58
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -1043,8 +1043,8 @@ _08004D9A:
thumb_func_end GetLastTextColor thumb_func_end GetLastTextColor
thumb_func_start CopyGlyphToWindow thumb_func_start CopyGlyphToWindow
; int CopyGlyphToWindow(struct TextPrinter *x) @ int CopyGlyphToWindow(struct TextPrinter *x)
CopyGlyphToWindow: ; 8004DA0 CopyGlyphToWindow: @ 8004DA0
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -1746,8 +1746,8 @@ _080052AA:
thumb_func_end CopyGlyphToWindow thumb_func_end CopyGlyphToWindow
thumb_func_start ClearTextSpan thumb_func_start ClearTextSpan
; void ClearTextSpan(TextPrinter *textPrinter, u32 width) @ void ClearTextSpan(TextPrinter *textPrinter, u32 width)
ClearTextSpan: ; 80052C8 ClearTextSpan: @ 80052C8
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x10 sub sp, 0x10
adds r4, r0, 0 adds r4, r0, 0
@@ -1799,8 +1799,8 @@ _0800531E:
thumb_func_end ClearTextSpan thumb_func_end ClearTextSpan
thumb_func_start Font0Func thumb_func_start Font0Func
; int Font0Func(struct TextPrinter *x) @ int Font0Func(struct TextPrinter *x)
Font0Func: ; 800533C Font0Func: @ 800533C
push {lr} push {lr}
adds r2, r0, 0 adds r2, r0, 0
adds r3, r2, 0 adds r3, r2, 0
@@ -1829,8 +1829,8 @@ _08005360:
thumb_func_end Font0Func thumb_func_end Font0Func
thumb_func_start Font1Func thumb_func_start Font1Func
; int Font1Func(struct TextPrinter *x) @ int Font1Func(struct TextPrinter *x)
Font1Func: ; 8005370 Font1Func: @ 8005370
push {lr} push {lr}
adds r2, r0, 0 adds r2, r0, 0
adds r3, r2, 0 adds r3, r2, 0
@@ -1861,8 +1861,8 @@ _08005398:
thumb_func_end Font1Func thumb_func_end Font1Func
thumb_func_start Font2Func thumb_func_start Font2Func
; int Font2Func(struct TextPrinter *x) @ int Font2Func(struct TextPrinter *x)
Font2Func: ; 80053A8 Font2Func: @ 80053A8
push {lr} push {lr}
adds r2, r0, 0 adds r2, r0, 0
adds r3, r2, 0 adds r3, r2, 0
@@ -1893,8 +1893,8 @@ _080053D0:
thumb_func_end Font2Func thumb_func_end Font2Func
thumb_func_start Font3Func thumb_func_start Font3Func
; int Font3Func(struct TextPrinter *x) @ int Font3Func(struct TextPrinter *x)
Font3Func: ; 80053E0 Font3Func: @ 80053E0
push {lr} push {lr}
adds r2, r0, 0 adds r2, r0, 0
adds r3, r2, 0 adds r3, r2, 0
@@ -1925,8 +1925,8 @@ _08005408:
thumb_func_end Font3Func thumb_func_end Font3Func
thumb_func_start Font4Func thumb_func_start Font4Func
; int Font4Func(struct TextPrinter *x) @ int Font4Func(struct TextPrinter *x)
Font4Func: ; 8005418 Font4Func: @ 8005418
push {lr} push {lr}
adds r2, r0, 0 adds r2, r0, 0
adds r3, r2, 0 adds r3, r2, 0
@@ -1957,8 +1957,8 @@ _08005440:
thumb_func_end Font4Func thumb_func_end Font4Func
thumb_func_start Font5Func thumb_func_start Font5Func
; int Font5Func(struct TextPrinter *x) @ int Font5Func(struct TextPrinter *x)
Font5Func: ; 8005450 Font5Func: @ 8005450
push {lr} push {lr}
adds r2, r0, 0 adds r2, r0, 0
adds r3, r2, 0 adds r3, r2, 0
@@ -1989,8 +1989,8 @@ _08005478:
thumb_func_end Font5Func thumb_func_end Font5Func
thumb_func_start Font7Func thumb_func_start Font7Func
; int Font7Func(struct TextPrinter *x) @ int Font7Func(struct TextPrinter *x)
Font7Func: ; 8005488 Font7Func: @ 8005488
push {lr} push {lr}
adds r2, r0, 0 adds r2, r0, 0
adds r3, r2, 0 adds r3, r2, 0
@@ -2021,8 +2021,8 @@ _080054B0:
thumb_func_end Font7Func thumb_func_end Font7Func
thumb_func_start Font8Func thumb_func_start Font8Func
; int Font8Func(struct TextPrinter *x) @ int Font8Func(struct TextPrinter *x)
Font8Func: ; 80054C0 Font8Func: @ 80054C0
push {lr} push {lr}
adds r2, r0, 0 adds r2, r0, 0
adds r3, r2, 0 adds r3, r2, 0
@@ -2053,8 +2053,8 @@ _080054E8:
thumb_func_end Font8Func thumb_func_end Font8Func
thumb_func_start TextPrinterInitDownArrowCounters thumb_func_start TextPrinterInitDownArrowCounters
; void TextPrinterInitDownArrowCounters(struct TextPrinter *textPrinter) @ void TextPrinterInitDownArrowCounters(struct TextPrinter *textPrinter)
TextPrinterInitDownArrowCounters: ; 80054F8 TextPrinterInitDownArrowCounters: @ 80054F8
push {lr} push {lr}
adds r2, r0, 0 adds r2, r0, 0
adds r2, 0x14 adds r2, 0x14
@@ -2083,8 +2083,8 @@ _08005524:
thumb_func_end TextPrinterInitDownArrowCounters thumb_func_end TextPrinterInitDownArrowCounters
thumb_func_start TextPrinterDrawDownArrow thumb_func_start TextPrinterDrawDownArrow
; void TextPrinterDrawDownArrow(struct TextPrinter *textPrinter) @ void TextPrinterDrawDownArrow(struct TextPrinter *textPrinter)
TextPrinterDrawDownArrow: ; 8005528 TextPrinterDrawDownArrow: @ 8005528
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x18 sub sp, 0x18
adds r5, r0, 0 adds r5, r0, 0
@@ -2191,8 +2191,8 @@ _080055EE:
thumb_func_end TextPrinterDrawDownArrow thumb_func_end TextPrinterDrawDownArrow
thumb_func_start TextPrinterClearDownArrow thumb_func_start TextPrinterClearDownArrow
; void TextPrinterClearDownArrow(struct TextPrinter *textPrinter) @ void TextPrinterClearDownArrow(struct TextPrinter *textPrinter)
TextPrinterClearDownArrow: ; 8005600 TextPrinterClearDownArrow: @ 8005600
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x8 sub sp, 0x8
adds r5, r0, 0 adds r5, r0, 0
@@ -2219,8 +2219,8 @@ TextPrinterClearDownArrow: ; 8005600
thumb_func_end TextPrinterClearDownArrow thumb_func_end TextPrinterClearDownArrow
thumb_func_start TextPrinterWaitAutoMode thumb_func_start TextPrinterWaitAutoMode
; bool8 TextPrinterWaitAutoMode(struct TextPrinter *textPrinter) @ bool8 TextPrinterWaitAutoMode(struct TextPrinter *textPrinter)
TextPrinterWaitAutoMode: ; 8005634 TextPrinterWaitAutoMode: @ 8005634
push {lr} push {lr}
adds r1, r0, 0 adds r1, r0, 0
adds r1, 0x14 adds r1, 0x14
@@ -2239,8 +2239,8 @@ _0800564A:
thumb_func_end TextPrinterWaitAutoMode thumb_func_end TextPrinterWaitAutoMode
thumb_func_start TextPrinterWaitWithDownArrow thumb_func_start TextPrinterWaitWithDownArrow
; bool8 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter) @ bool8 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter)
TextPrinterWaitWithDownArrow: ; 8005650 TextPrinterWaitWithDownArrow: @ 8005650
push {r4,lr} push {r4,lr}
adds r2, r0, 0 adds r2, r0, 0
movs r4, 0 movs r4, 0
@@ -2277,8 +2277,8 @@ _0800568E:
thumb_func_end TextPrinterWaitWithDownArrow thumb_func_end TextPrinterWaitWithDownArrow
thumb_func_start TextPrinterWait thumb_func_start TextPrinterWait
; bool8 TextPrinterWait(struct TextPrinter *textPrinter) @ bool8 TextPrinterWait(struct TextPrinter *textPrinter)
TextPrinterWait: ; 800569C TextPrinterWait: @ 800569C
push {r4,lr} push {r4,lr}
adds r2, r0, 0 adds r2, r0, 0
movs r4, 0 movs r4, 0
@@ -2313,8 +2313,8 @@ _080056D4:
thumb_func_end TextPrinterWait thumb_func_end TextPrinterWait
thumb_func_start DrawDownArrow thumb_func_start DrawDownArrow
; void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *counter, u8 *yCoordIndex) @ void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *counter, u8 *yCoordIndex)
DrawDownArrow: ; 80056E0 DrawDownArrow: @ 80056E0
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -2419,8 +2419,8 @@ _0800579A:
thumb_func_end DrawDownArrow thumb_func_end DrawDownArrow
thumb_func_start RenderText thumb_func_start RenderText
; u16 RenderText(struct TextPrinter *textPrinter) @ u16 RenderText(struct TextPrinter *textPrinter)
RenderText: ; 80057B4 RenderText: @ 80057B4
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r0, 0 adds r6, r0, 0
adds r4, r6, 0 adds r4, r6, 0
@@ -3146,8 +3146,8 @@ _08005D6E:
thumb_func_end RenderText thumb_func_end RenderText
thumb_func_start GetStringWidthFixedWidthFont thumb_func_start GetStringWidthFixedWidthFont
; u32 GetStringWidthFixedWidthFont(u8 *str, u8 fontId, u8 letterSpacing) @ u32 GetStringWidthFixedWidthFont(u8 *str, u8 fontId, u8 letterSpacing)
GetStringWidthFixedWidthFont: ; 8005D74 GetStringWidthFixedWidthFont: @ 8005D74
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -3285,8 +3285,8 @@ _08005E84:
thumb_func_end GetStringWidthFixedWidthFont thumb_func_end GetStringWidthFixedWidthFont
thumb_func_start GetFontWidthFunc thumb_func_start GetFontWidthFunc
; u8 GetFontWidthFunc(u16 glyphId) @ u8 GetFontWidthFunc(u16 glyphId)
GetFontWidthFunc: ; 8005EA8 GetFontWidthFunc: @ 8005EA8
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -3315,8 +3315,8 @@ _08005ED0:
thumb_func_end GetFontWidthFunc thumb_func_end GetFontWidthFunc
thumb_func_start GetStringWidth thumb_func_start GetStringWidth
; s32 GetStringWidth(u8 fontId, u8 *str, u16 letterSpacing) @ s32 GetStringWidth(u8 fontId, u8 *str, u16 letterSpacing)
GetStringWidth: ; 8005ED8 GetStringWidth: @ 8005ED8
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -3628,8 +3628,8 @@ _0800612E:
thumb_func_end GetStringWidth thumb_func_end GetStringWidth
thumb_func_start RenderTextFont9 thumb_func_start RenderTextFont9
; u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str) @ u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str)
RenderTextFont9: ; 8006140 RenderTextFont9: @ 8006140
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -3819,8 +3819,8 @@ _080062C0:
thumb_func_end RenderTextFont9 thumb_func_end RenderTextFont9
thumb_func_start DrawKeypadIcon thumb_func_start DrawKeypadIcon
; u8 DrawKeypadIcon(u8 windowId, u8 keypadIconId, u16 x, u16 y) @ u8 DrawKeypadIcon(u8 windowId, u8 keypadIconId, u16 x, u16 y)
DrawKeypadIcon: ; 80062E8 DrawKeypadIcon: @ 80062E8
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x18 sub sp, 0x18
lsls r0, 24 lsls r0, 24
@@ -3859,8 +3859,8 @@ DrawKeypadIcon: ; 80062E8
thumb_func_end DrawKeypadIcon thumb_func_end DrawKeypadIcon
thumb_func_start GetKeypadIconTileOffset thumb_func_start GetKeypadIconTileOffset
; u8 GetKeypadIconTileOffset(u8 keypadIconId) @ u8 GetKeypadIconTileOffset(u8 keypadIconId)
GetKeypadIconTileOffset: ; 8006338 GetKeypadIconTileOffset: @ 8006338
lsls r0, 24 lsls r0, 24
ldr r1, =gKeypadIcons ldr r1, =gKeypadIcons
lsrs r0, 22 lsrs r0, 22
@@ -3871,8 +3871,8 @@ GetKeypadIconTileOffset: ; 8006338
thumb_func_end GetKeypadIconTileOffset thumb_func_end GetKeypadIconTileOffset
thumb_func_start GetKeypadIconWidth thumb_func_start GetKeypadIconWidth
; u8 GetKeypadIconWidth(u8 keypadIconId) @ u8 GetKeypadIconWidth(u8 keypadIconId)
GetKeypadIconWidth: ; 8006348 GetKeypadIconWidth: @ 8006348
lsls r0, 24 lsls r0, 24
ldr r1, =gKeypadIcons ldr r1, =gKeypadIcons
lsrs r0, 22 lsrs r0, 22
@@ -3883,8 +3883,8 @@ GetKeypadIconWidth: ; 8006348
thumb_func_end GetKeypadIconWidth thumb_func_end GetKeypadIconWidth
thumb_func_start GetKeypadIconHeight thumb_func_start GetKeypadIconHeight
; u8 GetKeypadIconHeight(u8 keypadIconId) @ u8 GetKeypadIconHeight(u8 keypadIconId)
GetKeypadIconHeight: ; 8006358 GetKeypadIconHeight: @ 8006358
lsls r0, 24 lsls r0, 24
ldr r1, =gKeypadIcons ldr r1, =gKeypadIcons
lsrs r0, 22 lsrs r0, 22
@@ -3895,8 +3895,8 @@ GetKeypadIconHeight: ; 8006358
thumb_func_end GetKeypadIconHeight thumb_func_end GetKeypadIconHeight
thumb_func_start SetDefaultFontsPointer thumb_func_start SetDefaultFontsPointer
; void SetDefaultFontsPointer() @ void SetDefaultFontsPointer()
SetDefaultFontsPointer: ; 8006368 SetDefaultFontsPointer: @ 8006368
push {lr} push {lr}
ldr r0, =gFontInfos ldr r0, =gFontInfos
bl SetFontsPointer bl SetFontsPointer
@@ -3906,8 +3906,8 @@ SetDefaultFontsPointer: ; 8006368
thumb_func_end SetDefaultFontsPointer thumb_func_end SetDefaultFontsPointer
thumb_func_start GetFontAttribute thumb_func_start GetFontAttribute
; u8 GetFontAttribute(u8 fontId, u8 attributeId) @ u8 GetFontAttribute(u8 fontId, u8 attributeId)
GetFontAttribute: ; 8006378 GetFontAttribute: @ 8006378
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
@@ -4014,8 +4014,8 @@ _08006456:
thumb_func_end GetFontAttribute thumb_func_end GetFontAttribute
thumb_func_start GetMenuCursorDimensionByFont thumb_func_start GetMenuCursorDimensionByFont
; u8 GetMenuCursorDimensionByFont(u8 fontId, u8 whichDimension) @ u8 GetMenuCursorDimensionByFont(u8 fontId, u8 whichDimension)
GetMenuCursorDimensionByFont: ; 8006460 GetMenuCursorDimensionByFont: @ 8006460
lsls r0, 24 lsls r0, 24
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@@ -4029,8 +4029,8 @@ GetMenuCursorDimensionByFont: ; 8006460
thumb_func_end GetMenuCursorDimensionByFont thumb_func_end GetMenuCursorDimensionByFont
thumb_func_start DecompressGlyphFont0 thumb_func_start DecompressGlyphFont0
; void DecompressGlyphFont0(u16 glyphId, bool8 isJapanese) @ void DecompressGlyphFont0(u16 glyphId, bool8 isJapanese)
DecompressGlyphFont0: ; 8006478 DecompressGlyphFont0: @ 8006478
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 16 lsls r0, 16
lsrs r3, r0, 16 lsrs r3, r0, 16
@@ -4118,8 +4118,8 @@ _08006534:
thumb_func_end DecompressGlyphFont0 thumb_func_end DecompressGlyphFont0
thumb_func_start GetGlyphWidthFont0 thumb_func_start GetGlyphWidthFont0
; u8 GetGlyphWidthFont0(u16 glyphId, bool8 isJapanese) @ u8 GetGlyphWidthFont0(u16 glyphId, bool8 isJapanese)
GetGlyphWidthFont0: ; 8006540 GetGlyphWidthFont0: @ 8006540
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r2, r0, 16 lsrs r2, r0, 16
@@ -4138,8 +4138,8 @@ _0800655A:
thumb_func_end GetGlyphWidthFont0 thumb_func_end GetGlyphWidthFont0
thumb_func_start DecompressGlyphFont7 thumb_func_start DecompressGlyphFont7
; void DecompressGlyphFont7(u16 glyphId, bool8 isJapanese) @ void DecompressGlyphFont7(u16 glyphId, bool8 isJapanese)
DecompressGlyphFont7: ; 8006560 DecompressGlyphFont7: @ 8006560
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 16 lsls r0, 16
lsrs r3, r0, 16 lsrs r3, r0, 16
@@ -4227,8 +4227,8 @@ _0800661C:
thumb_func_end DecompressGlyphFont7 thumb_func_end DecompressGlyphFont7
thumb_func_start GetGlyphWidthFont7 thumb_func_start GetGlyphWidthFont7
; u8 GetGlyphWidthFont7(u16 glyphId, bool8 isJapanese) @ u8 GetGlyphWidthFont7(u16 glyphId, bool8 isJapanese)
GetGlyphWidthFont7: ; 8006628 GetGlyphWidthFont7: @ 8006628
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r2, r0, 16 lsrs r2, r0, 16
@@ -4247,8 +4247,8 @@ _08006642:
thumb_func_end GetGlyphWidthFont7 thumb_func_end GetGlyphWidthFont7
thumb_func_start DecompressGlyphFont8 thumb_func_start DecompressGlyphFont8
; void DecompressGlyphFont8(u16 glyphId, bool8 isJapanese) @ void DecompressGlyphFont8(u16 glyphId, bool8 isJapanese)
DecompressGlyphFont8: ; 8006648 DecompressGlyphFont8: @ 8006648
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 16 lsls r0, 16
lsrs r3, r0, 16 lsrs r3, r0, 16
@@ -4336,8 +4336,8 @@ _08006704:
thumb_func_end DecompressGlyphFont8 thumb_func_end DecompressGlyphFont8
thumb_func_start GetGlyphWidthFont8 thumb_func_start GetGlyphWidthFont8
; u8 GetGlyphWidthFont8(u16 glyphId, bool8 isJapanese) @ u8 GetGlyphWidthFont8(u16 glyphId, bool8 isJapanese)
GetGlyphWidthFont8: ; 8006710 GetGlyphWidthFont8: @ 8006710
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r2, r0, 16 lsrs r2, r0, 16
@@ -4356,8 +4356,8 @@ _0800672A:
thumb_func_end GetGlyphWidthFont8 thumb_func_end GetGlyphWidthFont8
thumb_func_start DecompressGlyphFont2 thumb_func_start DecompressGlyphFont2
; void DecompressGlyphFont2(u16 glyphId, bool8 isJapanese) @ void DecompressGlyphFont2(u16 glyphId, bool8 isJapanese)
DecompressGlyphFont2: ; 8006730 DecompressGlyphFont2: @ 8006730
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 16 lsls r0, 16
lsrs r6, r0, 16 lsrs r6, r0, 16
@@ -4459,8 +4459,8 @@ _08006810:
thumb_func_end DecompressGlyphFont2 thumb_func_end DecompressGlyphFont2
thumb_func_start GetGlyphWidthFont2 thumb_func_start GetGlyphWidthFont2
; u8 GetGlyphWidthFont2(u16 glyphId, bool8 isJapanese) @ u8 GetGlyphWidthFont2(u16 glyphId, bool8 isJapanese)
GetGlyphWidthFont2: ; 800681C GetGlyphWidthFont2: @ 800681C
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r2, r0, 16 lsrs r2, r0, 16
@@ -4480,8 +4480,8 @@ _08006832:
thumb_func_end GetGlyphWidthFont2 thumb_func_end GetGlyphWidthFont2
thumb_func_start DecompressGlyphFont1 thumb_func_start DecompressGlyphFont1
; void DecompressGlyphFont1(u16 glyphId, bool8 isJapanese) @ void DecompressGlyphFont1(u16 glyphId, bool8 isJapanese)
DecompressGlyphFont1: ; 8006840 DecompressGlyphFont1: @ 8006840
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 16 lsls r0, 16
lsrs r3, r0, 16 lsrs r3, r0, 16
@@ -4569,8 +4569,8 @@ _080068FC:
thumb_func_end DecompressGlyphFont1 thumb_func_end DecompressGlyphFont1
thumb_func_start GetGlyphWidthFont1 thumb_func_start GetGlyphWidthFont1
; u8 GetGlyphWidthFont1(u16 glyphId, bool8 isJapanese) @ u8 GetGlyphWidthFont1(u16 glyphId, bool8 isJapanese)
GetGlyphWidthFont1: ; 8006908 GetGlyphWidthFont1: @ 8006908
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r2, r0, 16 lsrs r2, r0, 16
@@ -4589,8 +4589,8 @@ _08006922:
thumb_func_end GetGlyphWidthFont1 thumb_func_end GetGlyphWidthFont1
thumb_func_start DecompressGlyphFont9 thumb_func_start DecompressGlyphFont9
; void DecompressGlyphFont9(u16 glyphId) @ void DecompressGlyphFont9(u16 glyphId)
DecompressGlyphFont9: ; 8006928 DecompressGlyphFont9: @ 8006928
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 20 lsrs r4, r0, 20
asm/tileset_animation.s
+85 -85
View File
@@ -1,6 +1,6 @@
thumb_func_start sub_80A0954 thumb_func_start sub_80A0954
; void sub_80A0954() @ void sub_80A0954()
sub_80A0954: ; 80A0954 sub_80A0954: @ 80A0954
push {lr} push {lr}
sub sp, 0x4 sub sp, 0x4
ldr r1, =0x03000f34 ldr r1, =0x03000f34
@@ -19,7 +19,7 @@ sub_80A0954: ; 80A0954
thumb_func_end sub_80A0954 thumb_func_end sub_80A0954
thumb_func_start sub_80A0980 thumb_func_start sub_80A0980
sub_80A0980: ; 80A0980 sub_80A0980: @ 80A0980
push {r4-r6,lr} push {r4-r6,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -60,7 +60,7 @@ _080A09C0:
thumb_func_end sub_80A0980 thumb_func_end sub_80A0980
thumb_func_start sub_80A09D0 thumb_func_start sub_80A09D0
sub_80A09D0: ; 80A09D0 sub_80A09D0: @ 80A09D0
push {r4-r6,lr} push {r4-r6,lr}
movs r3, 0 movs r3, 0
ldr r4, =0x03000f34 ldr r4, =0x03000f34
@@ -97,7 +97,7 @@ _080A0A02:
thumb_func_end sub_80A09D0 thumb_func_end sub_80A09D0
thumb_func_start cur_mapheader_run_tileset_funcs_after_some_cpuset thumb_func_start cur_mapheader_run_tileset_funcs_after_some_cpuset
cur_mapheader_run_tileset_funcs_after_some_cpuset: ; 80A0A18 cur_mapheader_run_tileset_funcs_after_some_cpuset: @ 80A0A18
push {lr} push {lr}
bl sub_80A0954 bl sub_80A0954
bl cur_mapheader_run_tileset1_func bl cur_mapheader_run_tileset1_func
@@ -107,7 +107,7 @@ cur_mapheader_run_tileset_funcs_after_some_cpuset: ; 80A0A18
thumb_func_end cur_mapheader_run_tileset_funcs_after_some_cpuset thumb_func_end cur_mapheader_run_tileset_funcs_after_some_cpuset
thumb_func_start sub_80A0A2C thumb_func_start sub_80A0A2C
sub_80A0A2C: ; 80A0A2C sub_80A0A2C: @ 80A0A2C
push {lr} push {lr}
bl cur_mapheader_run_tileset2_func bl cur_mapheader_run_tileset2_func
pop {r0} pop {r0}
@@ -115,7 +115,7 @@ sub_80A0A2C: ; 80A0A2C
thumb_func_end sub_80A0A2C thumb_func_end sub_80A0A2C
thumb_func_start sub_80A0A38 thumb_func_start sub_80A0A38
sub_80A0A38: ; 80A0A38 sub_80A0A38: @ 80A0A38
push {r4,lr} push {r4,lr}
bl sub_80A0954 bl sub_80A0954
ldr r2, =0x03000f36 ldr r2, =0x03000f36
@@ -165,7 +165,7 @@ _080A0A8A:
thumb_func_end sub_80A0A38 thumb_func_end sub_80A0A38
thumb_func_start cur_mapheader_run_tileset1_func thumb_func_start cur_mapheader_run_tileset1_func
cur_mapheader_run_tileset1_func: ; 80A0AA8 cur_mapheader_run_tileset1_func: @ 80A0AA8
push {lr} push {lr}
ldr r0, =0x03000f36 ldr r0, =0x03000f36
movs r1, 0 movs r1, 0
@@ -191,7 +191,7 @@ _080A0ACE:
thumb_func_end cur_mapheader_run_tileset1_func thumb_func_end cur_mapheader_run_tileset1_func
thumb_func_start cur_mapheader_run_tileset2_func thumb_func_start cur_mapheader_run_tileset2_func
cur_mapheader_run_tileset2_func: ; 80A0AE4 cur_mapheader_run_tileset2_func: @ 80A0AE4
push {lr} push {lr}
ldr r0, =0x03000f3a ldr r0, =0x03000f3a
movs r1, 0 movs r1, 0
@@ -217,7 +217,7 @@ _080A0B0A:
thumb_func_end cur_mapheader_run_tileset2_func thumb_func_end cur_mapheader_run_tileset2_func
thumb_func_start TilesetCb_General thumb_func_start TilesetCb_General
TilesetCb_General: ; 80A0B20 TilesetCb_General: @ 80A0B20
ldr r1, =0x03000f36 ldr r1, =0x03000f36
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -234,7 +234,7 @@ TilesetCb_General: ; 80A0B20
thumb_func_end TilesetCb_General thumb_func_end TilesetCb_General
thumb_func_start TilesetCb_InsideBuilding thumb_func_start TilesetCb_InsideBuilding
TilesetCb_InsideBuilding: ; 80A0B48 TilesetCb_InsideBuilding: @ 80A0B48
ldr r1, =0x03000f36 ldr r1, =0x03000f36
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -251,7 +251,7 @@ TilesetCb_InsideBuilding: ; 80A0B48
thumb_func_end TilesetCb_InsideBuilding thumb_func_end TilesetCb_InsideBuilding
thumb_func_start sub_80A0B70 thumb_func_start sub_80A0B70
sub_80A0B70: ; 80A0B70 sub_80A0B70: @ 80A0B70
push {r4,r5,lr} push {r4,r5,lr}
lsls r5, r0, 16 lsls r5, r0, 16
movs r0, 0xF0 movs r0, 0xF0
@@ -289,7 +289,7 @@ _080A0BAE:
thumb_func_end sub_80A0B70 thumb_func_end sub_80A0B70
thumb_func_start sub_80A0BB4 thumb_func_start sub_80A0BB4
sub_80A0BB4: ; 80A0BB4 sub_80A0BB4: @ 80A0BB4
push {lr} push {lr}
lsls r1, r0, 16 lsls r1, r0, 16
movs r0, 0xE0 movs r0, 0xE0
@@ -305,7 +305,7 @@ _080A0BC8:
thumb_func_end sub_80A0BB4 thumb_func_end sub_80A0BB4
thumb_func_start sub_80A0BCC thumb_func_start sub_80A0BCC
sub_80A0BCC: ; 80A0BCC sub_80A0BCC: @ 80A0BCC
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
movs r1, 0xC0 movs r1, 0xC0
@@ -324,7 +324,7 @@ sub_80A0BCC: ; 80A0BCC
thumb_func_end sub_80A0BCC thumb_func_end sub_80A0BCC
thumb_func_start sub_80A0BF4 thumb_func_start sub_80A0BF4
sub_80A0BF4: ; 80A0BF4 sub_80A0BF4: @ 80A0BF4
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
@@ -344,7 +344,7 @@ sub_80A0BF4: ; 80A0BF4
thumb_func_end sub_80A0BF4 thumb_func_end sub_80A0BF4
thumb_func_start sub_80A0C1C thumb_func_start sub_80A0C1C
sub_80A0C1C: ; 80A0C1C sub_80A0C1C: @ 80A0C1C
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
movs r1, 0xE0 movs r1, 0xE0
@@ -364,7 +364,7 @@ sub_80A0C1C: ; 80A0C1C
thumb_func_end sub_80A0C1C thumb_func_end sub_80A0C1C
thumb_func_start sub_80A0C44 thumb_func_start sub_80A0C44
sub_80A0C44: ; 80A0C44 sub_80A0C44: @ 80A0C44
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
movs r1, 0xC0 movs r1, 0xC0
@@ -383,7 +383,7 @@ sub_80A0C44: ; 80A0C44
thumb_func_end sub_80A0C44 thumb_func_end sub_80A0C44
thumb_func_start TilesetCb_Petalburg thumb_func_start TilesetCb_Petalburg
TilesetCb_Petalburg: ; 80A0C6C TilesetCb_Petalburg: @ 80A0C6C
ldr r1, =0x03000f3a ldr r1, =0x03000f3a
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -399,7 +399,7 @@ TilesetCb_Petalburg: ; 80A0C6C
thumb_func_end TilesetCb_Petalburg thumb_func_end TilesetCb_Petalburg
thumb_func_start TilesetCb_Rustboro thumb_func_start TilesetCb_Rustboro
TilesetCb_Rustboro: ; 80A0C94 TilesetCb_Rustboro: @ 80A0C94
ldr r1, =0x03000f3a ldr r1, =0x03000f3a
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -415,7 +415,7 @@ TilesetCb_Rustboro: ; 80A0C94
thumb_func_end TilesetCb_Rustboro thumb_func_end TilesetCb_Rustboro
thumb_func_start TilesetCb_Dewford thumb_func_start TilesetCb_Dewford
TilesetCb_Dewford: ; 80A0CC0 TilesetCb_Dewford: @ 80A0CC0
ldr r1, =0x03000f3a ldr r1, =0x03000f3a
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -431,7 +431,7 @@ TilesetCb_Dewford: ; 80A0CC0
thumb_func_end TilesetCb_Dewford thumb_func_end TilesetCb_Dewford
thumb_func_start TilesetCb_Slateport thumb_func_start TilesetCb_Slateport
TilesetCb_Slateport: ; 80A0CEC TilesetCb_Slateport: @ 80A0CEC
ldr r1, =0x03000f3a ldr r1, =0x03000f3a
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -447,7 +447,7 @@ TilesetCb_Slateport: ; 80A0CEC
thumb_func_end TilesetCb_Slateport thumb_func_end TilesetCb_Slateport
thumb_func_start TilesetCb_Mauville thumb_func_start TilesetCb_Mauville
TilesetCb_Mauville: ; 80A0D18 TilesetCb_Mauville: @ 80A0D18
ldr r1, =0x03000f3a ldr r1, =0x03000f3a
ldr r0, =0x03000f36 ldr r0, =0x03000f36
ldrh r0, [r0] ldrh r0, [r0]
@@ -464,7 +464,7 @@ TilesetCb_Mauville: ; 80A0D18
thumb_func_end TilesetCb_Mauville thumb_func_end TilesetCb_Mauville
thumb_func_start TilesetCb_Lavaridge thumb_func_start TilesetCb_Lavaridge
TilesetCb_Lavaridge: ; 80A0D48 TilesetCb_Lavaridge: @ 80A0D48
ldr r1, =0x03000f3a ldr r1, =0x03000f3a
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -480,7 +480,7 @@ TilesetCb_Lavaridge: ; 80A0D48
thumb_func_end TilesetCb_Lavaridge thumb_func_end TilesetCb_Lavaridge
thumb_func_start TilesetCb_Fallarbor thumb_func_start TilesetCb_Fallarbor
TilesetCb_Fallarbor: ; 80A0D74 TilesetCb_Fallarbor: @ 80A0D74
ldr r1, =0x03000f3a ldr r1, =0x03000f3a
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -496,7 +496,7 @@ TilesetCb_Fallarbor: ; 80A0D74
thumb_func_end TilesetCb_Fallarbor thumb_func_end TilesetCb_Fallarbor
thumb_func_start TilesetCb_Fortree thumb_func_start TilesetCb_Fortree
TilesetCb_Fortree: ; 80A0D9C TilesetCb_Fortree: @ 80A0D9C
ldr r1, =0x03000f3a ldr r1, =0x03000f3a
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -512,7 +512,7 @@ TilesetCb_Fortree: ; 80A0D9C
thumb_func_end TilesetCb_Fortree thumb_func_end TilesetCb_Fortree
thumb_func_start TilesetCb_Lilycove thumb_func_start TilesetCb_Lilycove
TilesetCb_Lilycove: ; 80A0DC4 TilesetCb_Lilycove: @ 80A0DC4
ldr r1, =0x03000f3a ldr r1, =0x03000f3a
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -528,7 +528,7 @@ TilesetCb_Lilycove: ; 80A0DC4
thumb_func_end TilesetCb_Lilycove thumb_func_end TilesetCb_Lilycove
thumb_func_start TilesetCb_Mossdeep thumb_func_start TilesetCb_Mossdeep
TilesetCb_Mossdeep: ; 80A0DEC TilesetCb_Mossdeep: @ 80A0DEC
ldr r1, =0x03000f3a ldr r1, =0x03000f3a
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -544,7 +544,7 @@ TilesetCb_Mossdeep: ; 80A0DEC
thumb_func_end TilesetCb_Mossdeep thumb_func_end TilesetCb_Mossdeep
thumb_func_start TilesetCb_EverGrande thumb_func_start TilesetCb_EverGrande
TilesetCb_EverGrande: ; 80A0E14 TilesetCb_EverGrande: @ 80A0E14
ldr r1, =0x03000f3a ldr r1, =0x03000f3a
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -560,7 +560,7 @@ TilesetCb_EverGrande: ; 80A0E14
thumb_func_end TilesetCb_EverGrande thumb_func_end TilesetCb_EverGrande
thumb_func_start TilesetCb_Pacifidlog thumb_func_start TilesetCb_Pacifidlog
TilesetCb_Pacifidlog: ; 80A0E40 TilesetCb_Pacifidlog: @ 80A0E40
ldr r1, =0x03000f3a ldr r1, =0x03000f3a
ldr r0, =0x03000f36 ldr r0, =0x03000f36
ldrh r0, [r0] ldrh r0, [r0]
@@ -577,7 +577,7 @@ TilesetCb_Pacifidlog: ; 80A0E40
thumb_func_end TilesetCb_Pacifidlog thumb_func_end TilesetCb_Pacifidlog
thumb_func_start TilesetCb_Sootopolis thumb_func_start TilesetCb_Sootopolis
TilesetCb_Sootopolis: ; 80A0E70 TilesetCb_Sootopolis: @ 80A0E70
ldr r1, =0x03000f3a ldr r1, =0x03000f3a
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -593,7 +593,7 @@ TilesetCb_Sootopolis: ; 80A0E70
thumb_func_end TilesetCb_Sootopolis thumb_func_end TilesetCb_Sootopolis
thumb_func_start TilesetCb_BattleFrontierOutsideWest thumb_func_start TilesetCb_BattleFrontierOutsideWest
TilesetCb_BattleFrontierOutsideWest: ; 80A0E9C TilesetCb_BattleFrontierOutsideWest: @ 80A0E9C
ldr r1, =0x03000f3a ldr r1, =0x03000f3a
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -609,7 +609,7 @@ TilesetCb_BattleFrontierOutsideWest: ; 80A0E9C
thumb_func_end TilesetCb_BattleFrontierOutsideWest thumb_func_end TilesetCb_BattleFrontierOutsideWest
thumb_func_start TilesetCb_BattleFrontierOutsideEast thumb_func_start TilesetCb_BattleFrontierOutsideEast
TilesetCb_BattleFrontierOutsideEast: ; 80A0EC8 TilesetCb_BattleFrontierOutsideEast: @ 80A0EC8
ldr r1, =0x03000f3a ldr r1, =0x03000f3a
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -625,7 +625,7 @@ TilesetCb_BattleFrontierOutsideEast: ; 80A0EC8
thumb_func_end TilesetCb_BattleFrontierOutsideEast thumb_func_end TilesetCb_BattleFrontierOutsideEast
thumb_func_start TilesetCb_Underwater thumb_func_start TilesetCb_Underwater
TilesetCb_Underwater: ; 80A0EF4 TilesetCb_Underwater: @ 80A0EF4
ldr r1, =0x03000f3a ldr r1, =0x03000f3a
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -640,7 +640,7 @@ TilesetCb_Underwater: ; 80A0EF4
thumb_func_end TilesetCb_Underwater thumb_func_end TilesetCb_Underwater
thumb_func_start TilesetCb_SootopolisGym thumb_func_start TilesetCb_SootopolisGym
TilesetCb_SootopolisGym: ; 80A0F18 TilesetCb_SootopolisGym: @ 80A0F18
ldr r1, =0x03000f3a ldr r1, =0x03000f3a
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -655,7 +655,7 @@ TilesetCb_SootopolisGym: ; 80A0F18
thumb_func_end TilesetCb_SootopolisGym thumb_func_end TilesetCb_SootopolisGym
thumb_func_start TilesetCb_Cave thumb_func_start TilesetCb_Cave
TilesetCb_Cave: ; 80A0F3C TilesetCb_Cave: @ 80A0F3C
ldr r1, =0x03000f3a ldr r1, =0x03000f3a
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -671,7 +671,7 @@ TilesetCb_Cave: ; 80A0F3C
thumb_func_end TilesetCb_Cave thumb_func_end TilesetCb_Cave
thumb_func_start TilesetCb_EliteFour thumb_func_start TilesetCb_EliteFour
TilesetCb_EliteFour: ; 80A0F68 TilesetCb_EliteFour: @ 80A0F68
ldr r1, =0x03000f3a ldr r1, =0x03000f3a
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -686,7 +686,7 @@ TilesetCb_EliteFour: ; 80A0F68
thumb_func_end TilesetCb_EliteFour thumb_func_end TilesetCb_EliteFour
thumb_func_start TilesetCb_MauvilleGym thumb_func_start TilesetCb_MauvilleGym
TilesetCb_MauvilleGym: ; 80A0F8C TilesetCb_MauvilleGym: @ 80A0F8C
ldr r1, =0x03000f3a ldr r1, =0x03000f3a
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -702,7 +702,7 @@ TilesetCb_MauvilleGym: ; 80A0F8C
thumb_func_end TilesetCb_MauvilleGym thumb_func_end TilesetCb_MauvilleGym
thumb_func_start TilesetCb_BikeShop thumb_func_start TilesetCb_BikeShop
TilesetCb_BikeShop: ; 80A0FB8 TilesetCb_BikeShop: @ 80A0FB8
ldr r1, =0x03000f3a ldr r1, =0x03000f3a
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -718,7 +718,7 @@ TilesetCb_BikeShop: ; 80A0FB8
thumb_func_end TilesetCb_BikeShop thumb_func_end TilesetCb_BikeShop
thumb_func_start TilesetCb_BattlePyramid thumb_func_start TilesetCb_BattlePyramid
TilesetCb_BattlePyramid: ; 80A0FE4 TilesetCb_BattlePyramid: @ 80A0FE4
ldr r1, =0x03000f3a ldr r1, =0x03000f3a
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -734,7 +734,7 @@ TilesetCb_BattlePyramid: ; 80A0FE4
thumb_func_end TilesetCb_BattlePyramid thumb_func_end TilesetCb_BattlePyramid
thumb_func_start TilesetCb_BattleDome thumb_func_start TilesetCb_BattleDome
TilesetCb_BattleDome: ; 80A1010 TilesetCb_BattleDome: @ 80A1010
ldr r1, =0x03000f3a ldr r1, =0x03000f3a
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -750,7 +750,7 @@ TilesetCb_BattleDome: ; 80A1010
thumb_func_end TilesetCb_BattleDome thumb_func_end TilesetCb_BattleDome
thumb_func_start sub_80A103C thumb_func_start sub_80A103C
sub_80A103C: ; 80A103C sub_80A103C: @ 80A103C
push {r4-r6,lr} push {r4-r6,lr}
lsls r5, r0, 16 lsls r5, r0, 16
movs r0, 0xE0 movs r0, 0xE0
@@ -814,7 +814,7 @@ _080A10B0:
thumb_func_end sub_80A103C thumb_func_end sub_80A103C
thumb_func_start sub_80A10B8 thumb_func_start sub_80A10B8
sub_80A10B8: ; 80A10B8 sub_80A10B8: @ 80A10B8
push {lr} push {lr}
lsls r1, r0, 16 lsls r1, r0, 16
movs r0, 0xE0 movs r0, 0xE0
@@ -830,7 +830,7 @@ _080A10CC:
thumb_func_end sub_80A10B8 thumb_func_end sub_80A10B8
thumb_func_start sub_80A10D0 thumb_func_start sub_80A10D0
sub_80A10D0: ; 80A10D0 sub_80A10D0: @ 80A10D0
push {lr} push {lr}
lsls r1, r0, 16 lsls r1, r0, 16
movs r0, 0xF0 movs r0, 0xF0
@@ -846,7 +846,7 @@ _080A10E4:
thumb_func_end sub_80A10D0 thumb_func_end sub_80A10D0
thumb_func_start sub_80A10E8 thumb_func_start sub_80A10E8
sub_80A10E8: ; 80A10E8 sub_80A10E8: @ 80A10E8
push {r4,r5,lr} push {r4,r5,lr}
lsls r4, r0, 16 lsls r4, r0, 16
movs r0, 0xE0 movs r0, 0xE0
@@ -907,7 +907,7 @@ _080A1154:
thumb_func_end sub_80A10E8 thumb_func_end sub_80A10E8
thumb_func_start sub_80A115C thumb_func_start sub_80A115C
sub_80A115C: ; 80A115C sub_80A115C: @ 80A115C
push {r4,r5,lr} push {r4,r5,lr}
lsls r4, r0, 16 lsls r4, r0, 16
movs r0, 0xF0 movs r0, 0xF0
@@ -932,7 +932,7 @@ _080A1180:
thumb_func_end sub_80A115C thumb_func_end sub_80A115C
thumb_func_start sub_80A1188 thumb_func_start sub_80A1188
sub_80A1188: ; 80A1188 sub_80A1188: @ 80A1188
push {r4,r5,lr} push {r4,r5,lr}
lsls r4, r0, 16 lsls r4, r0, 16
movs r0, 0xE0 movs r0, 0xE0
@@ -993,7 +993,7 @@ _080A11F4:
thumb_func_end sub_80A1188 thumb_func_end sub_80A1188
thumb_func_start sub_80A11FC thumb_func_start sub_80A11FC
sub_80A11FC: ; 80A11FC sub_80A11FC: @ 80A11FC
push {r4,r5,lr} push {r4,r5,lr}
lsls r4, r0, 16 lsls r4, r0, 16
movs r0, 0xF0 movs r0, 0xF0
@@ -1020,7 +1020,7 @@ _080A1224:
thumb_func_end sub_80A11FC thumb_func_end sub_80A11FC
thumb_func_start sub_80A122C thumb_func_start sub_80A122C
sub_80A122C: ; 80A122C sub_80A122C: @ 80A122C
push {lr} push {lr}
lsls r1, r0, 16 lsls r1, r0, 16
movs r0, 0xF0 movs r0, 0xF0
@@ -1036,7 +1036,7 @@ _080A1240:
thumb_func_end sub_80A122C thumb_func_end sub_80A122C
thumb_func_start sub_80A1244 thumb_func_start sub_80A1244
sub_80A1244: ; 80A1244 sub_80A1244: @ 80A1244
push {lr} push {lr}
lsls r1, r0, 16 lsls r1, r0, 16
movs r0, 0xF0 movs r0, 0xF0
@@ -1054,7 +1054,7 @@ _080A125C:
thumb_func_end sub_80A1244 thumb_func_end sub_80A1244
thumb_func_start sub_80A1260 thumb_func_start sub_80A1260
sub_80A1260: ; 80A1260 sub_80A1260: @ 80A1260
push {lr} push {lr}
lsls r1, r0, 16 lsls r1, r0, 16
movs r0, 0xF0 movs r0, 0xF0
@@ -1071,7 +1071,7 @@ _080A1276:
thumb_func_end sub_80A1260 thumb_func_end sub_80A1260
thumb_func_start sub_80A127C thumb_func_start sub_80A127C
sub_80A127C: ; 80A127C sub_80A127C: @ 80A127C
push {lr} push {lr}
lsls r1, r0, 16 lsls r1, r0, 16
movs r0, 0xE0 movs r0, 0xE0
@@ -1087,7 +1087,7 @@ _080A1290:
thumb_func_end sub_80A127C thumb_func_end sub_80A127C
thumb_func_start sub_80A1294 thumb_func_start sub_80A1294
sub_80A1294: ; 80A1294 sub_80A1294: @ 80A1294
push {lr} push {lr}
lsls r1, r0, 16 lsls r1, r0, 16
movs r0, 0xE0 movs r0, 0xE0
@@ -1103,7 +1103,7 @@ _080A12A8:
thumb_func_end sub_80A1294 thumb_func_end sub_80A1294
thumb_func_start sub_80A12AC thumb_func_start sub_80A12AC
sub_80A12AC: ; 80A12AC sub_80A12AC: @ 80A12AC
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
movs r1, 0xC0 movs r1, 0xC0
@@ -1123,7 +1123,7 @@ sub_80A12AC: ; 80A12AC
thumb_func_end sub_80A12AC thumb_func_end sub_80A12AC
thumb_func_start sub_80A12D4 thumb_func_start sub_80A12D4
sub_80A12D4: ; 80A12D4 sub_80A12D4: @ 80A12D4
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -1155,7 +1155,7 @@ sub_80A12D4: ; 80A12D4
thumb_func_end sub_80A12D4 thumb_func_end sub_80A12D4
thumb_func_start sub_80A131C thumb_func_start sub_80A131C
sub_80A131C: ; 80A131C sub_80A131C: @ 80A131C
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
movs r1, 0xC0 movs r1, 0xC0
@@ -1175,7 +1175,7 @@ sub_80A131C: ; 80A131C
thumb_func_end sub_80A131C thumb_func_end sub_80A131C
thumb_func_start sub_80A1344 thumb_func_start sub_80A1344
sub_80A1344: ; 80A1344 sub_80A1344: @ 80A1344
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
movs r1, 0xC0 movs r1, 0xC0
@@ -1194,7 +1194,7 @@ sub_80A1344: ; 80A1344
thumb_func_end sub_80A1344 thumb_func_end sub_80A1344
thumb_func_start sub_80A136C thumb_func_start sub_80A136C
sub_80A136C: ; 80A136C sub_80A136C: @ 80A136C
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
movs r1, 0xE0 movs r1, 0xE0
@@ -1214,7 +1214,7 @@ sub_80A136C: ; 80A136C
thumb_func_end sub_80A136C thumb_func_end sub_80A136C
thumb_func_start sub_80A1394 thumb_func_start sub_80A1394
sub_80A1394: ; 80A1394 sub_80A1394: @ 80A1394
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 16 lsls r0, 16
lsrs r5, r0, 16 lsrs r5, r0, 16
@@ -1279,7 +1279,7 @@ _080A141C:
thumb_func_end sub_80A1394 thumb_func_end sub_80A1394
thumb_func_start sub_80A1434 thumb_func_start sub_80A1434
sub_80A1434: ; 80A1434 sub_80A1434: @ 80A1434
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
@@ -1310,7 +1310,7 @@ _080A1464:
thumb_func_end sub_80A1434 thumb_func_end sub_80A1434
thumb_func_start sub_80A1470 thumb_func_start sub_80A1470
sub_80A1470: ; 80A1470 sub_80A1470: @ 80A1470
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
@@ -1329,7 +1329,7 @@ sub_80A1470: ; 80A1470
thumb_func_end sub_80A1470 thumb_func_end sub_80A1470
thumb_func_start sub_80A1498 thumb_func_start sub_80A1498
sub_80A1498: ; 80A1498 sub_80A1498: @ 80A1498
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
movs r1, 0xC0 movs r1, 0xC0
@@ -1348,7 +1348,7 @@ sub_80A1498: ; 80A1498
thumb_func_end sub_80A1498 thumb_func_end sub_80A1498
thumb_func_start sub_80A14C0 thumb_func_start sub_80A14C0
sub_80A14C0: ; 80A14C0 sub_80A14C0: @ 80A14C0
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
@@ -1375,7 +1375,7 @@ sub_80A14C0: ; 80A14C0
thumb_func_end sub_80A14C0 thumb_func_end sub_80A14C0
thumb_func_start sub_80A14F8 thumb_func_start sub_80A14F8
sub_80A14F8: ; 80A14F8 sub_80A14F8: @ 80A14F8
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
movs r1, 0xC0 movs r1, 0xC0
@@ -1394,7 +1394,7 @@ sub_80A14F8: ; 80A14F8
thumb_func_end sub_80A14F8 thumb_func_end sub_80A14F8
thumb_func_start sub_80A1520 thumb_func_start sub_80A1520
sub_80A1520: ; 80A1520 sub_80A1520: @ 80A1520
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
movs r1, 0xC0 movs r1, 0xC0
@@ -1413,7 +1413,7 @@ sub_80A1520: ; 80A1520
thumb_func_end sub_80A1520 thumb_func_end sub_80A1520
thumb_func_start sub_80A1548 thumb_func_start sub_80A1548
sub_80A1548: ; 80A1548 sub_80A1548: @ 80A1548
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
movs r1, 0xC0 movs r1, 0xC0
@@ -1432,7 +1432,7 @@ sub_80A1548: ; 80A1548
thumb_func_end sub_80A1548 thumb_func_end sub_80A1548
thumb_func_start sub_80A1570 thumb_func_start sub_80A1570
sub_80A1570: ; 80A1570 sub_80A1570: @ 80A1570
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
movs r1, 0xC0 movs r1, 0xC0
@@ -1451,7 +1451,7 @@ sub_80A1570: ; 80A1570
thumb_func_end sub_80A1570 thumb_func_end sub_80A1570
thumb_func_start sub_80A1598 thumb_func_start sub_80A1598
sub_80A1598: ; 80A1598 sub_80A1598: @ 80A1598
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
movs r1, 0xC0 movs r1, 0xC0
@@ -1470,7 +1470,7 @@ sub_80A1598: ; 80A1598
thumb_func_end sub_80A1598 thumb_func_end sub_80A1598
thumb_func_start sub_80A15C0 thumb_func_start sub_80A15C0
sub_80A15C0: ; 80A15C0 sub_80A15C0: @ 80A15C0
push {lr} push {lr}
lsls r2, r0, 16 lsls r2, r0, 16
lsrs r0, r2, 16 lsrs r0, r2, 16
@@ -1486,7 +1486,7 @@ _080A15D4:
thumb_func_end sub_80A15C0 thumb_func_end sub_80A15C0
thumb_func_start sub_80A15D8 thumb_func_start sub_80A15D8
sub_80A15D8: ; 80A15D8 sub_80A15D8: @ 80A15D8
push {lr} push {lr}
lsls r1, r0, 16 lsls r1, r0, 16
movs r0, 0xE0 movs r0, 0xE0
@@ -1502,7 +1502,7 @@ _080A15EC:
thumb_func_end sub_80A15D8 thumb_func_end sub_80A15D8
thumb_func_start sub_80A15F0 thumb_func_start sub_80A15F0
sub_80A15F0: ; 80A15F0 sub_80A15F0: @ 80A15F0
push {r4,r5,lr} push {r4,r5,lr}
lsls r4, r0, 16 lsls r4, r0, 16
lsrs r0, r4, 16 lsrs r0, r4, 16
@@ -1527,7 +1527,7 @@ _080A1614:
thumb_func_end sub_80A15F0 thumb_func_end sub_80A15F0
thumb_func_start sub_80A161C thumb_func_start sub_80A161C
sub_80A161C: ; 80A161C sub_80A161C: @ 80A161C
push {lr} push {lr}
lsls r1, r0, 16 lsls r1, r0, 16
movs r0, 0xC0 movs r0, 0xC0
@@ -1543,7 +1543,7 @@ _080A1630:
thumb_func_end sub_80A161C thumb_func_end sub_80A161C
thumb_func_start sub_80A1634 thumb_func_start sub_80A1634
sub_80A1634: ; 80A1634 sub_80A1634: @ 80A1634
push {r4,lr} push {r4,lr}
lsls r4, r0, 16 lsls r4, r0, 16
movs r0, 0xE0 movs r0, 0xE0
@@ -1563,7 +1563,7 @@ _080A1650:
thumb_func_end sub_80A1634 thumb_func_end sub_80A1634
thumb_func_start sub_80A1658 thumb_func_start sub_80A1658
sub_80A1658: ; 80A1658 sub_80A1658: @ 80A1658
push {lr} push {lr}
lsls r1, r0, 16 lsls r1, r0, 16
movs r0, 0xC0 movs r0, 0xC0
@@ -1579,7 +1579,7 @@ _080A166C:
thumb_func_end sub_80A1658 thumb_func_end sub_80A1658
thumb_func_start sub_80A1670 thumb_func_start sub_80A1670
sub_80A1670: ; 80A1670 sub_80A1670: @ 80A1670
push {lr} push {lr}
lsls r1, r0, 16 lsls r1, r0, 16
movs r0, 0xC0 movs r0, 0xC0
@@ -1595,7 +1595,7 @@ _080A1684:
thumb_func_end sub_80A1670 thumb_func_end sub_80A1670
thumb_func_start sub_80A1688 thumb_func_start sub_80A1688
sub_80A1688: ; 80A1688 sub_80A1688: @ 80A1688
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
@@ -1614,7 +1614,7 @@ sub_80A1688: ; 80A1688
thumb_func_end sub_80A1688 thumb_func_end sub_80A1688
thumb_func_start sub_80A16B0 thumb_func_start sub_80A16B0
sub_80A16B0: ; 80A16B0 sub_80A16B0: @ 80A16B0
push {r4,lr} push {r4,lr}
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
@@ -1644,7 +1644,7 @@ sub_80A16B0: ; 80A16B0
thumb_func_end sub_80A16B0 thumb_func_end sub_80A16B0
thumb_func_start sub_80A16F8 thumb_func_start sub_80A16F8
sub_80A16F8: ; 80A16F8 sub_80A16F8: @ 80A16F8
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
movs r1, 0xC0 movs r1, 0xC0
@@ -1663,7 +1663,7 @@ sub_80A16F8: ; 80A16F8
thumb_func_end sub_80A16F8 thumb_func_end sub_80A16F8
thumb_func_start sub_80A1720 thumb_func_start sub_80A1720
sub_80A1720: ; 80A1720 sub_80A1720: @ 80A1720
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
@@ -1682,7 +1682,7 @@ sub_80A1720: ; 80A1720
thumb_func_end sub_80A1720 thumb_func_end sub_80A1720
thumb_func_start sub_80A1748 thumb_func_start sub_80A1748
sub_80A1748: ; 80A1748 sub_80A1748: @ 80A1748
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
@@ -1702,7 +1702,7 @@ sub_80A1748: ; 80A1748
thumb_func_end sub_80A1748 thumb_func_end sub_80A1748
thumb_func_start sub_80A1770 thumb_func_start sub_80A1770
sub_80A1770: ; 80A1770 sub_80A1770: @ 80A1770
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
@@ -1722,7 +1722,7 @@ sub_80A1770: ; 80A1770
thumb_func_end sub_80A1770 thumb_func_end sub_80A1770
thumb_func_start sub_80A1798 thumb_func_start sub_80A1798
sub_80A1798: ; 80A1798 sub_80A1798: @ 80A1798
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
movs r1, 0xE0 movs r1, 0xE0
@@ -1742,7 +1742,7 @@ sub_80A1798: ; 80A1798
thumb_func_end sub_80A1798 thumb_func_end sub_80A1798
thumb_func_start sub_80A17C0 thumb_func_start sub_80A17C0
sub_80A17C0: ; 80A17C0 sub_80A17C0: @ 80A17C0
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
@@ -1763,7 +1763,7 @@ sub_80A17C0: ; 80A17C0
thumb_func_end sub_80A17C0 thumb_func_end sub_80A17C0
thumb_func_start sub_80A17EC thumb_func_start sub_80A17EC
sub_80A17EC: ; 80A17EC sub_80A17EC: @ 80A17EC
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
@@ -1784,7 +1784,7 @@ sub_80A17EC: ; 80A17EC
thumb_func_end sub_80A17EC thumb_func_end sub_80A17EC
thumb_func_start sub_80A1818 thumb_func_start sub_80A1818
sub_80A1818: ; 80A1818 sub_80A1818: @ 80A1818
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
ldr r2, =gUnknown_0852487C ldr r2, =gUnknown_0852487C
@@ -1826,7 +1826,7 @@ _080A1862:
thumb_func_end sub_80A1818 thumb_func_end sub_80A1818
thumb_func_start sub_80A1884 thumb_func_start sub_80A1884
sub_80A1884: ; 80A1884 sub_80A1884: @ 80A1884
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
ldr r2, =gUnknown_0852487C ldr r2, =gUnknown_0852487C
asm/window.s
+58 -58
View File
@@ -1,11 +1,11 @@
thumb_func_start nullsub_8 thumb_func_start nullsub_8
nullsub_8: ; 80031BC nullsub_8: @ 80031BC
bx lr bx lr
thumb_func_end nullsub_8 thumb_func_end nullsub_8
thumb_func_start InitWindows thumb_func_start InitWindows
; bool16 InitWindows(struct WindowTemplate *templates) @ bool16 InitWindows(struct WindowTemplate *templates)
InitWindows: ; 80031C0 InitWindows: @ 80031C0
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -216,8 +216,8 @@ _08003364:
thumb_func_end InitWindows thumb_func_end InitWindows
thumb_func_start AddWindow thumb_func_start AddWindow
; u8 AddWindow(struct WindowTemplate *template) @ u8 AddWindow(struct WindowTemplate *template)
AddWindow: ; 8003380 AddWindow: @ 8003380
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -382,8 +382,8 @@ _080034C0:
thumb_func_end AddWindow thumb_func_end AddWindow
thumb_func_start AddWindowWithoutTileMap thumb_func_start AddWindowWithoutTileMap
; int AddWindowWithoutTileMap(struct WindowTemplate *template) @ int AddWindowWithoutTileMap(struct WindowTemplate *template)
AddWindowWithoutTileMap: ; 80034D8 AddWindowWithoutTileMap: @ 80034D8
push {r4-r6,lr} push {r4-r6,lr}
adds r5, r0, 0 adds r5, r0, 0
movs r4, 0 movs r4, 0
@@ -462,8 +462,8 @@ _08003564:
thumb_func_end AddWindowWithoutTileMap thumb_func_end AddWindowWithoutTileMap
thumb_func_start RemoveWindow thumb_func_start RemoveWindow
; void RemoveWindow(u8 windowId) @ void RemoveWindow(u8 windowId)
RemoveWindow: ; 8003574 RemoveWindow: @ 8003574
push {r4-r7,lr} push {r4-r7,lr}
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
@@ -528,8 +528,8 @@ _080035E8:
thumb_func_end RemoveWindow thumb_func_end RemoveWindow
thumb_func_start FreeAllWindowBuffers thumb_func_start FreeAllWindowBuffers
; void FreeAllWindowBuffers() @ void FreeAllWindowBuffers()
FreeAllWindowBuffers: ; 8003604 FreeAllWindowBuffers: @ 8003604
push {r4-r6,lr} push {r4-r6,lr}
ldr r4, =0x03002f70 ldr r4, =0x03002f70
movs r5, 0x3 movs r5, 0x3
@@ -572,8 +572,8 @@ _0800363E:
thumb_func_end FreeAllWindowBuffers thumb_func_end FreeAllWindowBuffers
thumb_func_start CopyWindowToVram thumb_func_start CopyWindowToVram
; void CopyWindowToVram(u8 windowId, u8 mode) @ void CopyWindowToVram(u8 windowId, u8 mode)
CopyWindowToVram: ; 8003658 CopyWindowToVram: @ 8003658
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0xC sub sp, 0xC
lsls r0, 24 lsls r0, 24
@@ -640,8 +640,8 @@ _080036CE:
thumb_func_end CopyWindowToVram thumb_func_end CopyWindowToVram
thumb_func_start CopyWindowRectToVram thumb_func_start CopyWindowRectToVram
; void CopyWindowRectToVram(int rbox_id, int mode, int x, int y, int w, int h) @ void CopyWindowRectToVram(int rbox_id, int mode, int x, int y, int w, int h)
CopyWindowRectToVram: ; 80036D8 CopyWindowRectToVram: @ 80036D8
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0xC sub sp, 0xC
adds r6, r0, 0 adds r6, r0, 0
@@ -734,8 +734,8 @@ _08003782:
thumb_func_end CopyWindowRectToVram thumb_func_end CopyWindowRectToVram
thumb_func_start PutWindowTilemap thumb_func_start PutWindowTilemap
; void PutWindowTilemap(u8 windowId) @ void PutWindowTilemap(u8 windowId)
PutWindowTilemap: ; 800378C PutWindowTilemap: @ 800378C
push {r4,lr} push {r4,lr}
sub sp, 0x1C sub sp, 0x1C
lsls r0, 24 lsls r0, 24
@@ -784,8 +784,8 @@ PutWindowTilemap: ; 800378C
thumb_func_end PutWindowTilemap thumb_func_end PutWindowTilemap
thumb_func_start PutWindowRectTilemapOverridePalette thumb_func_start PutWindowRectTilemapOverridePalette
; void PutWindowRectTilemapOverridePalette(u8 windowId, u8 x, u8 y, u8 width, u8 height, u8 palette) @ void PutWindowRectTilemapOverridePalette(u8 windowId, u8 x, u8 y, u8 width, u8 height, u8 palette)
PutWindowRectTilemapOverridePalette: ; 80037EC PutWindowRectTilemapOverridePalette: @ 80037EC
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -879,8 +879,8 @@ _0800388E:
thumb_func_end PutWindowRectTilemapOverridePalette thumb_func_end PutWindowRectTilemapOverridePalette
thumb_func_start ClearWindowTilemap thumb_func_start ClearWindowTilemap
; void ClearWindowTilemap(u8 windowId) @ void ClearWindowTilemap(u8 windowId)
ClearWindowTilemap: ; 80038A4 ClearWindowTilemap: @ 80038A4
push {r4,lr} push {r4,lr}
sub sp, 0x18 sub sp, 0x18
lsls r0, 24 lsls r0, 24
@@ -919,8 +919,8 @@ ClearWindowTilemap: ; 80038A4
thumb_func_end ClearWindowTilemap thumb_func_end ClearWindowTilemap
thumb_func_start PutWindowRectTilemap thumb_func_start PutWindowRectTilemap
; void PutWindowRectTilemap(u8 windowId, u8 x, u8 y, u8 width, u8 height) @ void PutWindowRectTilemap(u8 windowId, u8 x, u8 y, u8 width, u8 height)
PutWindowRectTilemap: ; 80038F4 PutWindowRectTilemap: @ 80038F4
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -1010,8 +1010,8 @@ _0800398E:
thumb_func_end PutWindowRectTilemap thumb_func_end PutWindowRectTilemap
thumb_func_start BlitBitmapToWindow thumb_func_start BlitBitmapToWindow
; void BlitBitmapToWindow(u8 windowId, u8 *pixels, u16 x, u16 y, u16 width, u16 height) @ void BlitBitmapToWindow(u8 windowId, u8 *pixels, u16 x, u16 y, u16 width, u16 height)
BlitBitmapToWindow: ; 80039A4 BlitBitmapToWindow: @ 80039A4
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x18 sub sp, 0x18
ldr r4, [sp, 0x24] ldr r4, [sp, 0x24]
@@ -1042,8 +1042,8 @@ BlitBitmapToWindow: ; 80039A4
thumb_func_end BlitBitmapToWindow thumb_func_end BlitBitmapToWindow
thumb_func_start BlitBitmapRectToWindow thumb_func_start BlitBitmapRectToWindow
; void BlitBitmapRectToWindow(u8 windowId, u8 *pixels, u16 srcX, u16 srcY, u16 srcWidth, int srcHeight, u16 destX, u16 destY, u16 rectWidth, u16 rectHeight) @ void BlitBitmapRectToWindow(u8 windowId, u8 *pixels, u16 srcX, u16 srcY, u16 srcWidth, int srcHeight, u16 destX, u16 destY, u16 rectWidth, u16 rectHeight)
BlitBitmapRectToWindow: ; 80039DC BlitBitmapRectToWindow: @ 80039DC
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -1136,8 +1136,8 @@ BlitBitmapRectToWindow: ; 80039DC
thumb_func_end BlitBitmapRectToWindow thumb_func_end BlitBitmapRectToWindow
thumb_func_start BlitBitmapRectToWindowWithColorKey thumb_func_start BlitBitmapRectToWindowWithColorKey
; void BlitBitmapRectToWindowWithColorKey(u8 rbox_id, u8 *pixels, u16 srcX, u16 srcY, u16 srcWidth, int srcHeight, u16 destX, u16 destY, u16 rectWidth, u16 rectHeight, u8 colorKey) @ void BlitBitmapRectToWindowWithColorKey(u8 rbox_id, u8 *pixels, u16 srcX, u16 srcY, u16 srcWidth, int srcHeight, u16 destX, u16 destY, u16 rectWidth, u16 rectHeight, u8 colorKey)
BlitBitmapRectToWindowWithColorKey: ; 8003A9C BlitBitmapRectToWindowWithColorKey: @ 8003A9C
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -1234,8 +1234,8 @@ BlitBitmapRectToWindowWithColorKey: ; 8003A9C
thumb_func_end BlitBitmapRectToWindowWithColorKey thumb_func_end BlitBitmapRectToWindowWithColorKey
thumb_func_start FillWindowPixelRect thumb_func_start FillWindowPixelRect
; void FillWindowPixelRect(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16 height) @ void FillWindowPixelRect(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16 height)
FillWindowPixelRect: ; 8003B64 FillWindowPixelRect: @ 8003B64
push {r4-r6,lr} push {r4-r6,lr}
mov r6, r9 mov r6, r9
mov r5, r8 mov r5, r8
@@ -1302,8 +1302,8 @@ FillWindowPixelRect: ; 8003B64
thumb_func_end FillWindowPixelRect thumb_func_end FillWindowPixelRect
thumb_func_start CopyToWindowPixelBuffer thumb_func_start CopyToWindowPixelBuffer
; void CopyToWindowPixelBuffer(u8 windowId, u8 *src, u32 size, u16 tileOffset) @ void CopyToWindowPixelBuffer(u8 windowId, u8 *src, u32 size, u16 tileOffset)
CopyToWindowPixelBuffer: ; 8003BF0 CopyToWindowPixelBuffer: @ 8003BF0
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r1, 0 adds r6, r1, 0
lsls r0, 24 lsls r0, 24
@@ -1347,8 +1347,8 @@ _08003C3C:
thumb_func_end CopyToWindowPixelBuffer thumb_func_end CopyToWindowPixelBuffer
thumb_func_start FillWindowPixelBuffer thumb_func_start FillWindowPixelBuffer
; void FillWindowPixelBuffer(u8 windowId, u32 fillValue) @ void FillWindowPixelBuffer(u8 windowId, u32 fillValue)
FillWindowPixelBuffer: ; 8003C48 FillWindowPixelBuffer: @ 8003C48
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x4 sub sp, 0x4
lsls r0, 24 lsls r0, 24
@@ -1387,8 +1387,8 @@ FillWindowPixelBuffer: ; 8003C48
thumb_func_end FillWindowPixelBuffer thumb_func_end FillWindowPixelBuffer
thumb_func_start ScrollWindow thumb_func_start ScrollWindow
; void ScrollWindow(u8 windowId, u8 direction, u8 distance, u8 fillValue) @ void ScrollWindow(u8 windowId, u8 direction, u8 distance, u8 fillValue)
ScrollWindow: ; 8003C94 ScrollWindow: @ 8003C94
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -1913,8 +1913,8 @@ _08004046:
thumb_func_end ScrollWindow thumb_func_end ScrollWindow
thumb_func_start CallWindowFunction thumb_func_start CallWindowFunction
; void CallWindowFunction(u8 windowId, void ( *func)(u8, u8, u8, u8, u8, u8)) @ void CallWindowFunction(u8 windowId, void ( *func)(u8, u8, u8, u8, u8, u8))
CallWindowFunction: ; 8004058 CallWindowFunction: @ 8004058
push {r4-r6,lr} push {r4-r6,lr}
mov r6, r8 mov r6, r8
push {r6} push {r6}
@@ -1955,8 +1955,8 @@ CallWindowFunction: ; 8004058
thumb_func_end CallWindowFunction thumb_func_end CallWindowFunction
thumb_func_start SetWindowAttribute thumb_func_start SetWindowAttribute
; bool8 SetWindowAttribute(u8 windowId, u8 attributeId, u32 value) @ bool8 SetWindowAttribute(u8 windowId, u8 attributeId, u32 value)
SetWindowAttribute: ; 80040A8 SetWindowAttribute: @ 80040A8
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
@@ -2037,8 +2037,8 @@ _08004144:
thumb_func_end SetWindowAttribute thumb_func_end SetWindowAttribute
thumb_func_start GetWindowAttribute thumb_func_start GetWindowAttribute
; u32 GetWindowAttribute(u8 windowId, u8 attributeId) @ u32 GetWindowAttribute(u8 windowId, u8 attributeId)
GetWindowAttribute: ; 800414C GetWindowAttribute: @ 800414C
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
@@ -2143,8 +2143,8 @@ _0800422A:
thumb_func_end GetWindowAttribute thumb_func_end GetWindowAttribute
thumb_func_start GetNumActiveWindowsOnBg thumb_func_start GetNumActiveWindowsOnBg
; u8 GetNumActiveWindowsOnBg(u8 bgId) @ u8 GetNumActiveWindowsOnBg(u8 bgId)
GetNumActiveWindowsOnBg: ; 8004230 GetNumActiveWindowsOnBg: @ 8004230
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -2171,13 +2171,13 @@ _08004248:
thumb_func_end GetNumActiveWindowsOnBg thumb_func_end GetNumActiveWindowsOnBg
thumb_func_start nullsub_9 thumb_func_start nullsub_9
nullsub_9: ; 800425C nullsub_9: @ 800425C
bx lr bx lr
thumb_func_end nullsub_9 thumb_func_end nullsub_9
thumb_func_start AddWindow8Bit thumb_func_start AddWindow8Bit
; u16 AddWindow8Bit(struct WindowTemplate *template) @ u16 AddWindow8Bit(struct WindowTemplate *template)
AddWindow8Bit: ; 8004260 AddWindow8Bit: @ 8004260
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -2306,8 +2306,8 @@ _08004356:
thumb_func_end AddWindow8Bit thumb_func_end AddWindow8Bit
thumb_func_start FillWindowPixelBuffer8Bit thumb_func_start FillWindowPixelBuffer8Bit
; void FillWindowPixelBuffer8Bit(u8 windowId, u8 fillValue) @ void FillWindowPixelBuffer8Bit(u8 windowId, u8 fillValue)
FillWindowPixelBuffer8Bit: ; 8004368 FillWindowPixelBuffer8Bit: @ 8004368
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -2344,8 +2344,8 @@ _0800439E:
thumb_func_end FillWindowPixelBuffer8Bit thumb_func_end FillWindowPixelBuffer8Bit
thumb_func_start FillWindowPixelRect8Bit thumb_func_start FillWindowPixelRect8Bit
; void FillWindowPixelRect8Bit(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16 height) @ void FillWindowPixelRect8Bit(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16 height)
FillWindowPixelRect8Bit: ; 80043A8 FillWindowPixelRect8Bit: @ 80043A8
push {r4-r6,lr} push {r4-r6,lr}
mov r6, r9 mov r6, r9
mov r5, r8 mov r5, r8
@@ -2412,8 +2412,8 @@ FillWindowPixelRect8Bit: ; 80043A8
thumb_func_end FillWindowPixelRect8Bit thumb_func_end FillWindowPixelRect8Bit
thumb_func_start BlitBitmapRectToWindow4BitTo8Bit thumb_func_start BlitBitmapRectToWindow4BitTo8Bit
; void BlitBitmapRectToWindow4BitTo8Bit(u8 rbox_id, u8 *pixels, u16 srcX, u16 srcY, u16 srcWidth, int srcHeight, u16 destX, u16 destY, u16 rectWidth, u16 rectHeight, u8 paletteOffset) @ void BlitBitmapRectToWindow4BitTo8Bit(u8 rbox_id, u8 *pixels, u16 srcX, u16 srcY, u16 srcWidth, int srcHeight, u16 destX, u16 destY, u16 rectWidth, u16 rectHeight, u8 paletteOffset)
BlitBitmapRectToWindow4BitTo8Bit: ; 8004434 BlitBitmapRectToWindow4BitTo8Bit: @ 8004434
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -2512,8 +2512,8 @@ BlitBitmapRectToWindow4BitTo8Bit: ; 8004434
thumb_func_end BlitBitmapRectToWindow4BitTo8Bit thumb_func_end BlitBitmapRectToWindow4BitTo8Bit
thumb_func_start CopyWindowToVram8Bit thumb_func_start CopyWindowToVram8Bit
; void CopyWindowToVram8Bit(u8 windowId, u8 mode) @ void CopyWindowToVram8Bit(u8 windowId, u8 mode)
CopyWindowToVram8Bit: ; 8004500 CopyWindowToVram8Bit: @ 8004500
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -2572,8 +2572,8 @@ _08004570:
thumb_func_end CopyWindowToVram8Bit thumb_func_end CopyWindowToVram8Bit
thumb_func_start GetNumActiveWindowsOnBg8Bit thumb_func_start GetNumActiveWindowsOnBg8Bit
; int GetNumActiveWindowsOnBg8Bit(int bg_id) @ int GetNumActiveWindowsOnBg8Bit(int bg_id)
GetNumActiveWindowsOnBg8Bit: ; 8004578 GetNumActiveWindowsOnBg8Bit: @ 8004578
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
data/base_stats.s
+3290 -3290
View File
File diff suppressed because it is too large Load Diff
data/battle_frontier/battle_arena_move_mind_ratings.s
+356 -356
View File
@@ -1,358 +1,358 @@
.align 2, 0 .align 2, 0
gBattleArenaMoveMindRatings: ; 8611DC0 gBattleArenaMoveMindRatings: @ 8611DC0
.byte 0 ; - .byte 0 @ -
.byte 1 ; Pound .byte 1 @ Pound
.byte 1 ; Karate Chop .byte 1 @ Karate Chop
.byte 1 ; Double Slap .byte 1 @ Double Slap
.byte 1 ; Comet Punch .byte 1 @ Comet Punch
.byte 1 ; Mega Punch .byte 1 @ Mega Punch
.byte 1 ; Pay Day .byte 1 @ Pay Day
.byte 1 ; Fire Punch .byte 1 @ Fire Punch
.byte 1 ; Ice Punch .byte 1 @ Ice Punch
.byte 1 ; Thunder Punch .byte 1 @ Thunder Punch
.byte 1 ; Scratch .byte 1 @ Scratch
.byte 1 ; Vice Grip .byte 1 @ Vice Grip
.byte 1 ; Guillotine .byte 1 @ Guillotine
.byte 1 ; Razor Wind .byte 1 @ Razor Wind
.byte 0 ; Swords Dance .byte 0 @ Swords Dance
.byte 1 ; Cut .byte 1 @ Cut
.byte 1 ; Gust .byte 1 @ Gust
.byte 1 ; Wing Attack .byte 1 @ Wing Attack
.byte 0 ; Whirlwind .byte 0 @ Whirlwind
.byte 1 ; Fly .byte 1 @ Fly
.byte 1 ; Bind .byte 1 @ Bind
.byte 1 ; Slam .byte 1 @ Slam
.byte 1 ; Vine Whip .byte 1 @ Vine Whip
.byte 1 ; Stomp .byte 1 @ Stomp
.byte 1 ; Double Kick .byte 1 @ Double Kick
.byte 1 ; Mega Kick .byte 1 @ Mega Kick
.byte 1 ; Jump Kick .byte 1 @ Jump Kick
.byte 1 ; Rolling Kick .byte 1 @ Rolling Kick
.byte 0 ; Sand-Attack .byte 0 @ Sand-Attack
.byte 1 ; Headbutt .byte 1 @ Headbutt
.byte 1 ; Horn Attack .byte 1 @ Horn Attack
.byte 1 ; Fury Attack .byte 1 @ Fury Attack
.byte 1 ; Horn Drill .byte 1 @ Horn Drill
.byte 1 ; Tackle .byte 1 @ Tackle
.byte 1 ; Body Slam .byte 1 @ Body Slam
.byte 1 ; Wrap .byte 1 @ Wrap
.byte 1 ; Take Down .byte 1 @ Take Down
.byte 1 ; Thrash .byte 1 @ Thrash
.byte 1 ; Double-Edge .byte 1 @ Double-Edge
.byte 0 ; Tail Whip .byte 0 @ Tail Whip
.byte 1 ; Poison Sting .byte 1 @ Poison Sting
.byte 1 ; Twineedle .byte 1 @ Twineedle
.byte 1 ; Pin Missile .byte 1 @ Pin Missile
.byte 0 ; Leer .byte 0 @ Leer
.byte 1 ; Bite .byte 1 @ Bite
.byte 0 ; Growl .byte 0 @ Growl
.byte 0 ; Roar .byte 0 @ Roar
.byte 0 ; Sing .byte 0 @ Sing
.byte 0 ; Supersonic .byte 0 @ Supersonic
.byte 1 ; Sonic Boom .byte 1 @ Sonic Boom
.byte 0 ; Disable .byte 0 @ Disable
.byte 1 ; Acid .byte 1 @ Acid
.byte 1 ; Ember .byte 1 @ Ember
.byte 1 ; Flamethrower .byte 1 @ Flamethrower
.byte 0 ; Mist .byte 0 @ Mist
.byte 1 ; Water Gun .byte 1 @ Water Gun
.byte 1 ; Hydro Pump .byte 1 @ Hydro Pump
.byte 1 ; Surf .byte 1 @ Surf
.byte 1 ; Ice Beam .byte 1 @ Ice Beam
.byte 1 ; Blizzard .byte 1 @ Blizzard
.byte 1 ; Psybeam .byte 1 @ Psybeam
.byte 1 ; Bubble Beam .byte 1 @ Bubble Beam
.byte 1 ; Aurora Beam .byte 1 @ Aurora Beam
.byte 1 ; Hyper Beam .byte 1 @ Hyper Beam
.byte 1 ; Peck .byte 1 @ Peck
.byte 1 ; Drill Peck .byte 1 @ Drill Peck
.byte 1 ; Submission .byte 1 @ Submission
.byte 1 ; Low Kick .byte 1 @ Low Kick
.byte 0 ; Counter .byte 0 @ Counter
.byte 1 ; Seismic Toss .byte 1 @ Seismic Toss
.byte 1 ; Strength .byte 1 @ Strength
.byte 1 ; Absorb .byte 1 @ Absorb
.byte 1 ; Mega Drain .byte 1 @ Mega Drain
.byte 0 ; Leech Seed .byte 0 @ Leech Seed
.byte 0 ; Growth .byte 0 @ Growth
.byte 1 ; Razor Leaf .byte 1 @ Razor Leaf
.byte 1 ; Solar Beam .byte 1 @ Solar Beam
.byte 0 ; Poison Powder .byte 0 @ Poison Powder
.byte 0 ; Stun Spore .byte 0 @ Stun Spore
.byte 0 ; Sleep Powder .byte 0 @ Sleep Powder
.byte 1 ; Petal Dance .byte 1 @ Petal Dance
.byte 0 ; String Shot .byte 0 @ String Shot
.byte 1 ; Dragon Rage .byte 1 @ Dragon Rage
.byte 1 ; Fire Spin .byte 1 @ Fire Spin
.byte 1 ; Thunder Shock .byte 1 @ Thunder Shock
.byte 1 ; Thunderbolt .byte 1 @ Thunderbolt
.byte 0 ; Thunder Wave .byte 0 @ Thunder Wave
.byte 1 ; Thunder .byte 1 @ Thunder
.byte 1 ; Rock Throw .byte 1 @ Rock Throw
.byte 1 ; Earthquake .byte 1 @ Earthquake
.byte 1 ; Fissure .byte 1 @ Fissure
.byte 1 ; Dig .byte 1 @ Dig
.byte 0 ; Toxic .byte 0 @ Toxic
.byte 1 ; Confusion .byte 1 @ Confusion
.byte 1 ; Psychic .byte 1 @ Psychic
.byte 0 ; Hypnosis .byte 0 @ Hypnosis
.byte 0 ; Meditate .byte 0 @ Meditate
.byte 0 ; Agility .byte 0 @ Agility
.byte 1 ; Quick Attack .byte 1 @ Quick Attack
.byte 1 ; Rage .byte 1 @ Rage
.byte 0 ; Teleport .byte 0 @ Teleport
.byte 1 ; Night Shade .byte 1 @ Night Shade
.byte 0 ; Mimic .byte 0 @ Mimic
.byte 0 ; Screech .byte 0 @ Screech
.byte 0 ; Double Team .byte 0 @ Double Team
.byte 0 ; Recover .byte 0 @ Recover
.byte 0 ; Harden .byte 0 @ Harden
.byte 0 ; Minimize .byte 0 @ Minimize
.byte 0 ; Smokescreen .byte 0 @ Smokescreen
.byte 0 ; Confuse Ray .byte 0 @ Confuse Ray
.byte 0 ; Withdraw .byte 0 @ Withdraw
.byte 0 ; Defense Curl .byte 0 @ Defense Curl
.byte 0 ; Barrier .byte 0 @ Barrier
.byte 0 ; Light Screen .byte 0 @ Light Screen
.byte 0 ; Haze .byte 0 @ Haze
.byte 0 ; Reflect .byte 0 @ Reflect
.byte 0 ; Focus Energy .byte 0 @ Focus Energy
.byte 0 ; Bide .byte 0 @ Bide
.byte 0 ; Metronome .byte 0 @ Metronome
.byte 0 ; Mirror Move .byte 0 @ Mirror Move
.byte 1 ; Self-Destruct .byte 1 @ Self-Destruct
.byte 1 ; Egg Bomb .byte 1 @ Egg Bomb
.byte 1 ; Lick .byte 1 @ Lick
.byte 1 ; Smog .byte 1 @ Smog
.byte 1 ; Sludge .byte 1 @ Sludge
.byte 1 ; Bone Club .byte 1 @ Bone Club
.byte 1 ; Fire Blast .byte 1 @ Fire Blast
.byte 1 ; Waterfall .byte 1 @ Waterfall
.byte 1 ; Clamp .byte 1 @ Clamp
.byte 1 ; Swift .byte 1 @ Swift
.byte 1 ; Skull Bash .byte 1 @ Skull Bash
.byte 1 ; Spike Cannon .byte 1 @ Spike Cannon
.byte 1 ; Constrict .byte 1 @ Constrict
.byte 0 ; Amnesia .byte 0 @ Amnesia
.byte 0 ; Kinesis .byte 0 @ Kinesis
.byte 0 ; Soft-Boiled .byte 0 @ Soft-Boiled
.byte 1 ; Hi Jump Kick .byte 1 @ Hi Jump Kick
.byte 0 ; Glare .byte 0 @ Glare
.byte 1 ; Dream Eater .byte 1 @ Dream Eater
.byte 0 ; Poison Gas .byte 0 @ Poison Gas
.byte 1 ; Barrage .byte 1 @ Barrage
.byte 1 ; Leech Life .byte 1 @ Leech Life
.byte 0 ; Lovely Kiss .byte 0 @ Lovely Kiss
.byte 1 ; Sky Attack .byte 1 @ Sky Attack
.byte 0 ; Transform .byte 0 @ Transform
.byte 1 ; Bubble .byte 1 @ Bubble
.byte 1 ; Dizzy Punch .byte 1 @ Dizzy Punch
.byte 0 ; Spore .byte 0 @ Spore
.byte 0 ; Flash .byte 0 @ Flash
.byte 1 ; Psywave .byte 1 @ Psywave
.byte 0 ; Splash .byte 0 @ Splash
.byte 0 ; Acid Armor .byte 0 @ Acid Armor
.byte 1 ; Crabhammer .byte 1 @ Crabhammer
.byte 1 ; Explosion .byte 1 @ Explosion
.byte 1 ; Fury Swipes .byte 1 @ Fury Swipes
.byte 1 ; Bonemerang .byte 1 @ Bonemerang
.byte 0 ; Rest .byte 0 @ Rest
.byte 1 ; Rock Slide .byte 1 @ Rock Slide
.byte 1 ; Hyper Fang .byte 1 @ Hyper Fang
.byte 0 ; Sharpen .byte 0 @ Sharpen
.byte 0 ; Conversion .byte 0 @ Conversion
.byte 1 ; Tri Attack .byte 1 @ Tri Attack
.byte 1 ; Super Fang .byte 1 @ Super Fang
.byte 1 ; Slash .byte 1 @ Slash
.byte 0 ; Substitute .byte 0 @ Substitute
.byte 1 ; Struggle .byte 1 @ Struggle
.byte 0 ; Sketch .byte 0 @ Sketch
.byte 1 ; Triple Kick .byte 1 @ Triple Kick
.byte 1 ; Thief .byte 1 @ Thief
.byte 0 ; Spider Web .byte 0 @ Spider Web
.byte 0 ; Mind Reader .byte 0 @ Mind Reader
.byte 0 ; Nightmare .byte 0 @ Nightmare
.byte 1 ; Flame Wheel .byte 1 @ Flame Wheel
.byte 1 ; Snore .byte 1 @ Snore
.byte 0 ; Curse .byte 0 @ Curse
.byte 1 ; Flail .byte 1 @ Flail
.byte 0 ; Conversion 2 .byte 0 @ Conversion 2
.byte 1 ; Aeroblast .byte 1 @ Aeroblast
.byte 0 ; Cotton Spore .byte 0 @ Cotton Spore
.byte 1 ; Reversal .byte 1 @ Reversal
.byte 0 ; Spite .byte 0 @ Spite
.byte 1 ; Powder Snow .byte 1 @ Powder Snow
.byte -1 ; Protect .byte -1 @ Protect
.byte 1 ; Mach Punch .byte 1 @ Mach Punch
.byte 0 ; Scary Face .byte 0 @ Scary Face
.byte 1 ; Faint Attack .byte 1 @ Faint Attack
.byte 0 ; Sweet Kiss .byte 0 @ Sweet Kiss
.byte 0 ; Belly Drum .byte 0 @ Belly Drum
.byte 1 ; Sludge Bomb .byte 1 @ Sludge Bomb
.byte 1 ; Mud-Slap .byte 1 @ Mud-Slap
.byte 1 ; Octazooka .byte 1 @ Octazooka
.byte 0 ; Spikes .byte 0 @ Spikes
.byte 1 ; Zap Cannon .byte 1 @ Zap Cannon
.byte 0 ; Foresight .byte 0 @ Foresight
.byte 0 ; Destiny Bond .byte 0 @ Destiny Bond
.byte 0 ; Perish Song .byte 0 @ Perish Song
.byte 1 ; Icy Wind .byte 1 @ Icy Wind
.byte -1 ; Detect .byte -1 @ Detect
.byte 1 ; Bone Rush .byte 1 @ Bone Rush
.byte 0 ; Lock-On .byte 0 @ Lock-On
.byte 1 ; Outrage .byte 1 @ Outrage
.byte 0 ; Sandstorm .byte 0 @ Sandstorm
.byte 1 ; Giga Drain .byte 1 @ Giga Drain
.byte -1 ; Endure .byte -1 @ Endure
.byte 0 ; Charm .byte 0 @ Charm
.byte 1 ; Rollout .byte 1 @ Rollout
.byte 1 ; False Swipe .byte 1 @ False Swipe
.byte 0 ; Swagger .byte 0 @ Swagger
.byte 0 ; Milk Drink .byte 0 @ Milk Drink
.byte 1 ; Spark .byte 1 @ Spark
.byte 1 ; Fury Cutter .byte 1 @ Fury Cutter
.byte 1 ; Steel Wing .byte 1 @ Steel Wing
.byte 0 ; Mean Look .byte 0 @ Mean Look
.byte 0 ; Attract .byte 0 @ Attract
.byte 0 ; Sleep Talk .byte 0 @ Sleep Talk
.byte 0 ; Heal Bell .byte 0 @ Heal Bell
.byte 1 ; Return .byte 1 @ Return
.byte 1 ; Present .byte 1 @ Present
.byte 1 ; Frustration .byte 1 @ Frustration
.byte 0 ; Safeguard .byte 0 @ Safeguard
.byte 0 ; Pain Split .byte 0 @ Pain Split
.byte 1 ; Sacred Fire .byte 1 @ Sacred Fire
.byte 1 ; Magnitude .byte 1 @ Magnitude
.byte 1 ; Dynamic Punch .byte 1 @ Dynamic Punch
.byte 1 ; Megahorn .byte 1 @ Megahorn
.byte 1 ; Dragon Breath .byte 1 @ Dragon Breath
.byte 0 ; Baton Pass .byte 0 @ Baton Pass
.byte 0 ; Encore .byte 0 @ Encore
.byte 1 ; Pursuit .byte 1 @ Pursuit
.byte 1 ; Rapid Spin .byte 1 @ Rapid Spin
.byte 0 ; Sweet Scent .byte 0 @ Sweet Scent
.byte 1 ; Iron Tail .byte 1 @ Iron Tail
.byte 1 ; Metal Claw .byte 1 @ Metal Claw
.byte 1 ; Vital Throw .byte 1 @ Vital Throw
.byte 0 ; Morning Sun .byte 0 @ Morning Sun
.byte 0 ; Synthesis .byte 0 @ Synthesis
.byte 0 ; Moonlight .byte 0 @ Moonlight
.byte 1 ; Hidden Power .byte 1 @ Hidden Power
.byte 1 ; Cross Chop .byte 1 @ Cross Chop
.byte 1 ; Twister .byte 1 @ Twister
.byte 0 ; Rain Dance .byte 0 @ Rain Dance
.byte 0 ; Sunny Day .byte 0 @ Sunny Day
.byte 1 ; Crunch .byte 1 @ Crunch
.byte 0 ; Mirror Coat .byte 0 @ Mirror Coat
.byte 0 ; Psych Up .byte 0 @ Psych Up
.byte 1 ; Extreme Speed .byte 1 @ Extreme Speed
.byte 1 ; Ancient Power .byte 1 @ Ancient Power
.byte 1 ; Shadow Ball .byte 1 @ Shadow Ball
.byte 1 ; Future Sight .byte 1 @ Future Sight
.byte 1 ; Rock Smash .byte 1 @ Rock Smash
.byte 1 ; Whirlpool .byte 1 @ Whirlpool
.byte 1 ; Beat Up .byte 1 @ Beat Up
.byte -1 ; Fake Out .byte -1 @ Fake Out
.byte 1 ; Uproar .byte 1 @ Uproar
.byte 0 ; Stockpile .byte 0 @ Stockpile
.byte 1 ; Spit Up .byte 1 @ Spit Up
.byte 0 ; Swallow .byte 0 @ Swallow
.byte 1 ; Heat Wave .byte 1 @ Heat Wave
.byte 0 ; Hail .byte 0 @ Hail
.byte 0 ; Torment .byte 0 @ Torment
.byte 0 ; Flatter .byte 0 @ Flatter
.byte 0 ; Will-O-Wisp .byte 0 @ Will-O-Wisp
.byte 0 ; Memento .byte 0 @ Memento
.byte 1 ; Facade .byte 1 @ Facade
.byte 1 ; Focus Punch .byte 1 @ Focus Punch
.byte 1 ; Smelling Salt .byte 1 @ Smelling Salt
.byte 0 ; Follow Me .byte 0 @ Follow Me
.byte 0 ; Nature Power .byte 0 @ Nature Power
.byte 0 ; Charge .byte 0 @ Charge
.byte 0 ; Taunt .byte 0 @ Taunt
.byte 0 ; Helping Hand .byte 0 @ Helping Hand
.byte 0 ; Trick .byte 0 @ Trick
.byte 0 ; Role Play .byte 0 @ Role Play
.byte 0 ; Wish .byte 0 @ Wish
.byte 0 ; Assist .byte 0 @ Assist
.byte 0 ; Ingrain .byte 0 @ Ingrain
.byte 1 ; Superpower .byte 1 @ Superpower
.byte 0 ; Magic Coat .byte 0 @ Magic Coat
.byte 0 ; Recycle .byte 0 @ Recycle
.byte 1 ; Revenge .byte 1 @ Revenge
.byte 1 ; Brick Break .byte 1 @ Brick Break
.byte 0 ; Yawn .byte 0 @ Yawn
.byte 1 ; Knock Off .byte 1 @ Knock Off
.byte 1 ; Endeavor .byte 1 @ Endeavor
.byte 1 ; Eruption .byte 1 @ Eruption
.byte 0 ; Skill Swap .byte 0 @ Skill Swap
.byte 0 ; Imprison .byte 0 @ Imprison
.byte 0 ; Refresh .byte 0 @ Refresh
.byte 0 ; Grudge .byte 0 @ Grudge
.byte 0 ; Snatch .byte 0 @ Snatch
.byte 1 ; Secret Power .byte 1 @ Secret Power
.byte 1 ; Dive .byte 1 @ Dive
.byte 1 ; Arm Thrust .byte 1 @ Arm Thrust
.byte 0 ; Camouflage .byte 0 @ Camouflage
.byte 0 ; Tail Glow .byte 0 @ Tail Glow
.byte 1 ; Luster Purge .byte 1 @ Luster Purge
.byte 1 ; Mist Ball .byte 1 @ Mist Ball
.byte 0 ; Feather Dance .byte 0 @ Feather Dance
.byte 0 ; Teeter Dance .byte 0 @ Teeter Dance
.byte 1 ; Blaze Kick .byte 1 @ Blaze Kick
.byte 0 ; Mud Sport .byte 0 @ Mud Sport
.byte 1 ; Ice Ball .byte 1 @ Ice Ball
.byte 1 ; Needle Arm .byte 1 @ Needle Arm
.byte 0 ; Slack Off .byte 0 @ Slack Off
.byte 1 ; Hyper Voice .byte 1 @ Hyper Voice
.byte 1 ; Poison Fang .byte 1 @ Poison Fang
.byte 1 ; Crush Claw .byte 1 @ Crush Claw
.byte 1 ; Blast Burn .byte 1 @ Blast Burn
.byte 1 ; Hydro Cannon .byte 1 @ Hydro Cannon
.byte 1 ; Meteor Mash .byte 1 @ Meteor Mash
.byte 1 ; Astonish .byte 1 @ Astonish
.byte 1 ; Weather Ball .byte 1 @ Weather Ball
.byte 0 ; Aromatherapy .byte 0 @ Aromatherapy
.byte 0 ; Fake Tears .byte 0 @ Fake Tears
.byte 1 ; Air Cutter .byte 1 @ Air Cutter
.byte 1 ; Overheat .byte 1 @ Overheat
.byte 0 ; Odor Sleuth .byte 0 @ Odor Sleuth
.byte 1 ; Rock Tomb .byte 1 @ Rock Tomb
.byte 1 ; Silver Wind .byte 1 @ Silver Wind
.byte 0 ; Metal Sound .byte 0 @ Metal Sound
.byte 0 ; Grass Whistle .byte 0 @ Grass Whistle
.byte 0 ; Tickle .byte 0 @ Tickle
.byte 0 ; Cosmic Power .byte 0 @ Cosmic Power
.byte 1 ; Water Spout .byte 1 @ Water Spout
.byte 1 ; Signal Beam .byte 1 @ Signal Beam
.byte 1 ; Shadow Punch .byte 1 @ Shadow Punch
.byte 1 ; Extrasensory .byte 1 @ Extrasensory
.byte 1 ; Sky Uppercut .byte 1 @ Sky Uppercut
.byte 1 ; Sand Tomb .byte 1 @ Sand Tomb
.byte 1 ; Sheer Cold .byte 1 @ Sheer Cold
.byte 1 ; Muddy Water .byte 1 @ Muddy Water
.byte 1 ; Bullet Seed .byte 1 @ Bullet Seed
.byte 1 ; Aerial Ace .byte 1 @ Aerial Ace
.byte 1 ; Icicle Spear .byte 1 @ Icicle Spear
.byte 0 ; Iron Defense .byte 0 @ Iron Defense
.byte 0 ; Block .byte 0 @ Block
.byte 0 ; Howl .byte 0 @ Howl
.byte 1 ; Dragon Claw .byte 1 @ Dragon Claw
.byte 1 ; Frenzy Plant .byte 1 @ Frenzy Plant
.byte 0 ; Bulk Up .byte 0 @ Bulk Up
.byte 1 ; Bounce .byte 1 @ Bounce
.byte 1 ; Mud Shot .byte 1 @ Mud Shot
.byte 1 ; Poison Tail .byte 1 @ Poison Tail
.byte 1 ; Covet .byte 1 @ Covet
.byte 1 ; Volt Tackle .byte 1 @ Volt Tackle
.byte 1 ; Magical Leaf .byte 1 @ Magical Leaf
.byte 0 ; Water Sport .byte 0 @ Water Sport
.byte 0 ; Calm Mind .byte 0 @ Calm Mind
.byte 1 ; Leaf Blade .byte 1 @ Leaf Blade
.byte 0 ; Dragon Dance .byte 0 @ Dragon Dance
.byte 1 ; Rock Blast .byte 1 @ Rock Blast
.byte 1 ; Shock Wave .byte 1 @ Shock Wave
.byte 1 ; Water Pulse .byte 1 @ Water Pulse
.byte 1 ; Doom Desire .byte 1 @ Doom Desire
.byte 1 ; Psycho Boost .byte 1 @ Psycho Boost
data/battle_frontier/battle_factory_style_move_lists.s
+9 -9
View File
@@ -1,6 +1,6 @@
.align 2, 0 .align 2, 0
gBattleFactoryStyleRequiredMoveCounts: ; 8611FC0 gBattleFactoryStyleRequiredMoveCounts: @ 8611FC0
.byte 3 .byte 3
.byte 3 .byte 3
.byte 3 .byte 3
@@ -11,7 +11,7 @@ gBattleFactoryStyleRequiredMoveCounts: ; 8611FC0
.align 2, 0 .align 2, 0
gBattleFactoryStyleMoveList_TotalPreparation: ; 8611FC8 gBattleFactoryStyleMoveList_TotalPreparation: @ 8611FC8
.2byte MOVE_SWORDS_DANCE .2byte MOVE_SWORDS_DANCE
.2byte MOVE_GROWTH .2byte MOVE_GROWTH
.2byte MOVE_MEDITATE .2byte MOVE_MEDITATE
@@ -41,7 +41,7 @@ gBattleFactoryStyleMoveList_TotalPreparation: ; 8611FC8
.2byte MOVE_DRAGON_DANCE .2byte MOVE_DRAGON_DANCE
.2byte 0 .2byte 0
gBattleFactoryStyleMoveList_ImpossibleToPredict: ; 8612000 gBattleFactoryStyleMoveList_ImpossibleToPredict: @ 8612000
.2byte MOVE_MIMIC .2byte MOVE_MIMIC
.2byte MOVE_METRONOME .2byte MOVE_METRONOME
.2byte MOVE_MIRROR_MOVE .2byte MOVE_MIRROR_MOVE
@@ -58,7 +58,7 @@ gBattleFactoryStyleMoveList_ImpossibleToPredict: ; 8612000
.2byte MOVE_CAMOUFLAGE .2byte MOVE_CAMOUFLAGE
.2byte 0 .2byte 0
gBattleFactoryStyleMoveList_WeakeningTheFoe: ; 861201E gBattleFactoryStyleMoveList_WeakeningTheFoe: @ 861201E
.2byte MOVE_SAND_ATTACK .2byte MOVE_SAND_ATTACK
.2byte MOVE_TAIL_WHIP .2byte MOVE_TAIL_WHIP
.2byte MOVE_LEER .2byte MOVE_LEER
@@ -80,7 +80,7 @@ gBattleFactoryStyleMoveList_WeakeningTheFoe: ; 861201E
.2byte MOVE_TICKLE .2byte MOVE_TICKLE
.2byte 0 .2byte 0
gBattleFactoryStyleMoveList_HighRiskHighReturn: ; 8612046 gBattleFactoryStyleMoveList_HighRiskHighReturn: @ 8612046
.2byte MOVE_GUILLOTINE .2byte MOVE_GUILLOTINE
.2byte MOVE_HORN_DRILL .2byte MOVE_HORN_DRILL
.2byte MOVE_DOUBLE_EDGE .2byte MOVE_DOUBLE_EDGE
@@ -109,7 +109,7 @@ gBattleFactoryStyleMoveList_HighRiskHighReturn: ; 8612046
.2byte MOVE_VOLT_TACKLE .2byte MOVE_VOLT_TACKLE
.2byte 0 .2byte 0
gBattleFactoryStyleMoveList_Endurance: ; 861207C gBattleFactoryStyleMoveList_Endurance: @ 861207C
.2byte MOVE_MIST .2byte MOVE_MIST
.2byte MOVE_RECOVER .2byte MOVE_RECOVER
.2byte MOVE_LIGHT_SCREEN .2byte MOVE_LIGHT_SCREEN
@@ -139,7 +139,7 @@ gBattleFactoryStyleMoveList_Endurance: ; 861207C
.2byte MOVE_WATER_SPORT .2byte MOVE_WATER_SPORT
.2byte 0 .2byte 0
gBattleFactoryStyleMoveList_SlowAndSteady: ; 86120B4 gBattleFactoryStyleMoveList_SlowAndSteady: @ 86120B4
.2byte MOVE_SING .2byte MOVE_SING
.2byte MOVE_SUPERSONIC .2byte MOVE_SUPERSONIC
.2byte MOVE_DISABLE .2byte MOVE_DISABLE
@@ -174,7 +174,7 @@ gBattleFactoryStyleMoveList_SlowAndSteady: ; 86120B4
.2byte MOVE_BLOCK .2byte MOVE_BLOCK
.2byte 0 .2byte 0
gBattleFactoryStyleMoveList_DependsOnTheBattlesFlow: ; 86120F6 gBattleFactoryStyleMoveList_DependsOnTheBattlesFlow: @ 86120F6
.2byte MOVE_SANDSTORM .2byte MOVE_SANDSTORM
.2byte MOVE_RAIN_DANCE .2byte MOVE_RAIN_DANCE
.2byte MOVE_SUNNY_DAY .2byte MOVE_SUNNY_DAY
@@ -184,7 +184,7 @@ gBattleFactoryStyleMoveList_DependsOnTheBattlesFlow: ; 86120F6
.align 2, 0 .align 2, 0
gBattleFactoryStyleMoveListPointers: ; 8612104 gBattleFactoryStyleMoveListPointers: @ 8612104
.4byte gBattleFactoryStyleMoveList_TotalPreparation .4byte gBattleFactoryStyleMoveList_TotalPreparation
.4byte gBattleFactoryStyleMoveList_SlowAndSteady .4byte gBattleFactoryStyleMoveList_SlowAndSteady
.4byte gBattleFactoryStyleMoveList_Endurance .4byte gBattleFactoryStyleMoveList_Endurance
data/battle_frontier/battle_frontier_held_items.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0 .align 2, 0
gBattleFrontierHeldItems: ; 85CECB0 gBattleFrontierHeldItems: @ 85CECB0
.2byte ITEM_NONE .2byte ITEM_NONE
.2byte ITEM_KINGS_ROCK .2byte ITEM_KINGS_ROCK
.2byte ITEM_SITRUS_BERRY .2byte ITEM_SITRUS_BERRY
data/battle_frontier/battle_frontier_mons.s
+883 -883
View File
File diff suppressed because it is too large Load Diff
data/battle_frontier/battle_frontier_trainer_mons.s
+300 -300
View File
File diff suppressed because it is too large Load Diff
data/battle_frontier/battle_frontier_trainers.s
+1201 -1201
View File
File diff suppressed because it is too large Load Diff
data/battle_frontier/battle_pyramid_level_50_wild_mons.s
+501 -501
View File
File diff suppressed because it is too large Load Diff
data/battle_frontier/battle_pyramid_open_level_wild_mons.s
+501 -501
View File
File diff suppressed because it is too large Load Diff
data/battle_frontier/fallarbor_battle_tent_mons.s
+46 -46
View File
@@ -1,315 +1,315 @@
.align 2, 0 .align 2, 0
gFallarborBattleTentMons: ; 85DF69C gFallarborBattleTentMons: @ 85DF69C
; 0 @ 0
.2byte SPECIES_NUMEL .2byte SPECIES_NUMEL
.2byte MOVE_GROWL, MOVE_FLAMETHROWER, MOVE_TACKLE, MOVE_SUNNY_DAY .2byte MOVE_GROWL, MOVE_FLAMETHROWER, MOVE_TACKLE, MOVE_SUNNY_DAY
.byte BATTLE_FRONTIER_ITEM_CHARCOAL .byte BATTLE_FRONTIER_ITEM_CHARCOAL
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_QUIET .4byte NATURE_QUIET
; 1 @ 1
.2byte SPECIES_LINOONE .2byte SPECIES_LINOONE
.2byte MOVE_ODOR_SLEUTH, MOVE_COVET, MOVE_ROCK_SMASH, MOVE_CHARM .2byte MOVE_ODOR_SLEUTH, MOVE_COVET, MOVE_ROCK_SMASH, MOVE_CHARM
.byte BATTLE_FRONTIER_ITEM_SILK_SCARF .byte BATTLE_FRONTIER_ITEM_SILK_SCARF
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
.4byte NATURE_SASSY .4byte NATURE_SASSY
; 2 @ 2
.2byte SPECIES_PLUSLE .2byte SPECIES_PLUSLE
.2byte MOVE_SPARK, MOVE_GROWL, MOVE_QUICK_ATTACK, MOVE_FAKE_TEARS .2byte MOVE_SPARK, MOVE_GROWL, MOVE_QUICK_ATTACK, MOVE_FAKE_TEARS
.byte BATTLE_FRONTIER_ITEM_MENTAL_HERB .byte BATTLE_FRONTIER_ITEM_MENTAL_HERB
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
.4byte NATURE_MODEST .4byte NATURE_MODEST
; 3 @ 3
.2byte SPECIES_POOCHYENA .2byte SPECIES_POOCHYENA
.2byte MOVE_YAWN, MOVE_ODOR_SLEUTH, MOVE_HOWL, MOVE_FRUSTRATION .2byte MOVE_YAWN, MOVE_ODOR_SLEUTH, MOVE_HOWL, MOVE_FRUSTRATION
.byte BATTLE_FRONTIER_ITEM_LEPPA_BERRY .byte BATTLE_FRONTIER_ITEM_LEPPA_BERRY
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
.4byte NATURE_NAUGHTY .4byte NATURE_NAUGHTY
; 4 @ 4
.2byte SPECIES_KECLEON .2byte SPECIES_KECLEON
.2byte MOVE_LICK, MOVE_SLASH, MOVE_FAINT_ATTACK, MOVE_PSYBEAM .2byte MOVE_LICK, MOVE_SLASH, MOVE_FAINT_ATTACK, MOVE_PSYBEAM
.byte BATTLE_FRONTIER_ITEM_WIKI_BERRY .byte BATTLE_FRONTIER_ITEM_WIKI_BERRY
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
.4byte NATURE_MODEST .4byte NATURE_MODEST
; 5 @ 5
.2byte SPECIES_MAGIKARP .2byte SPECIES_MAGIKARP
.2byte MOVE_SPLASH, MOVE_TACKLE, MOVE_FLAIL, MOVE_NONE .2byte MOVE_SPLASH, MOVE_TACKLE, MOVE_FLAIL, MOVE_NONE
.byte BATTLE_FRONTIER_ITEM_DRAGON_SCALE .byte BATTLE_FRONTIER_ITEM_DRAGON_SCALE
.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_QUIRKY .4byte NATURE_QUIRKY
; 6 @ 6
.2byte SPECIES_SOLROCK .2byte SPECIES_SOLROCK
.2byte MOVE_ROCK_THROW, MOVE_FLASH, MOVE_SANDSTORM, MOVE_PSYWAVE .2byte MOVE_ROCK_THROW, MOVE_FLASH, MOVE_SANDSTORM, MOVE_PSYWAVE
.byte BATTLE_FRONTIER_ITEM_HARD_STONE .byte BATTLE_FRONTIER_ITEM_HARD_STONE
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
.4byte NATURE_SASSY .4byte NATURE_SASSY
; 7 @ 7
.2byte SPECIES_MAKUHITA .2byte SPECIES_MAKUHITA
.2byte MOVE_DETECT, MOVE_ARM_THRUST, MOVE_FAKE_OUT, MOVE_SMELLING_SALT .2byte MOVE_DETECT, MOVE_ARM_THRUST, MOVE_FAKE_OUT, MOVE_SMELLING_SALT
.byte BATTLE_FRONTIER_ITEM_BLACK_BELT .byte BATTLE_FRONTIER_ITEM_BLACK_BELT
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 8 @ 8
.2byte SPECIES_MACHOKE .2byte SPECIES_MACHOKE
.2byte MOVE_COUNTER, MOVE_REVENGE, MOVE_BULK_UP, MOVE_FOCUS_ENERGY .2byte MOVE_COUNTER, MOVE_REVENGE, MOVE_BULK_UP, MOVE_FOCUS_ENERGY
.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
.4byte NATURE_NAIVE .4byte NATURE_NAIVE
; 9 @ 9
.2byte SPECIES_NINCADA .2byte SPECIES_NINCADA
.2byte MOVE_FURY_SWIPES, MOVE_ENDURE, MOVE_MUD_SLAP, MOVE_DIG .2byte MOVE_FURY_SWIPES, MOVE_ENDURE, MOVE_MUD_SLAP, MOVE_DIG
.byte BATTLE_FRONTIER_ITEM_LUM_BERRY .byte BATTLE_FRONTIER_ITEM_LUM_BERRY
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
.4byte NATURE_SERIOUS .4byte NATURE_SERIOUS
; 10 @ 10
.2byte SPECIES_BEAUTIFLY .2byte SPECIES_BEAUTIFLY
.2byte MOVE_FLASH, MOVE_MORNING_SUN, MOVE_HARDEN, MOVE_MEGA_DRAIN .2byte MOVE_FLASH, MOVE_MORNING_SUN, MOVE_HARDEN, MOVE_MEGA_DRAIN
.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
.4byte NATURE_QUIRKY .4byte NATURE_QUIRKY
; 11 @ 11
.2byte SPECIES_DUSTOX .2byte SPECIES_DUSTOX
.2byte MOVE_MOONLIGHT, MOVE_HARDEN, MOVE_POISON_STING, MOVE_PSYBEAM .2byte MOVE_MOONLIGHT, MOVE_HARDEN, MOVE_POISON_STING, MOVE_PSYBEAM
.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE
.4byte NATURE_DOCILE .4byte NATURE_DOCILE
; 12 @ 12
.2byte SPECIES_ILLUMISE .2byte SPECIES_ILLUMISE
.2byte MOVE_METRONOME, MOVE_FLATTER, MOVE_WISH, MOVE_ATTRACT .2byte MOVE_METRONOME, MOVE_FLATTER, MOVE_WISH, MOVE_ATTRACT
.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 13 @ 13
.2byte SPECIES_VOLBEAT .2byte SPECIES_VOLBEAT
.2byte MOVE_TACKLE, MOVE_MOONLIGHT, MOVE_SIGNAL_BEAM, MOVE_TAIL_GLOW .2byte MOVE_TACKLE, MOVE_MOONLIGHT, MOVE_SIGNAL_BEAM, MOVE_TAIL_GLOW
.byte BATTLE_FRONTIER_ITEM_LEPPA_BERRY .byte BATTLE_FRONTIER_ITEM_LEPPA_BERRY
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 14 @ 14
.2byte SPECIES_NINJASK .2byte SPECIES_NINJASK
.2byte MOVE_DOUBLE_TEAM, MOVE_PROTECT, MOVE_DIG, MOVE_SAND_ATTACK .2byte MOVE_DOUBLE_TEAM, MOVE_PROTECT, MOVE_DIG, MOVE_SAND_ATTACK
.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
.4byte NATURE_TIMID .4byte NATURE_TIMID
; 15 @ 15
.2byte SPECIES_NINJASK .2byte SPECIES_NINJASK
.2byte MOVE_SWORDS_DANCE, MOVE_CUT, MOVE_FURY_CUTTER, MOVE_LEECH_LIFE .2byte MOVE_SWORDS_DANCE, MOVE_CUT, MOVE_FURY_CUTTER, MOVE_LEECH_LIFE
.byte BATTLE_FRONTIER_ITEM_SILVER_POWDER .byte BATTLE_FRONTIER_ITEM_SILVER_POWDER
.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 16 @ 16
.2byte SPECIES_ARON .2byte SPECIES_ARON
.2byte MOVE_METAL_CLAW, MOVE_PROTECT, MOVE_SHOCK_WAVE, MOVE_METAL_SOUND .2byte MOVE_METAL_CLAW, MOVE_PROTECT, MOVE_SHOCK_WAVE, MOVE_METAL_SOUND
.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_LONELY .4byte NATURE_LONELY
; 17 @ 17
.2byte SPECIES_ARON .2byte SPECIES_ARON
.2byte MOVE_SECRET_POWER, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_MUD_SLAP .2byte MOVE_SECRET_POWER, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_MUD_SLAP
.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
.4byte NATURE_GENTLE .4byte NATURE_GENTLE
; 18 @ 18
.2byte SPECIES_ELECTRIKE .2byte SPECIES_ELECTRIKE
.2byte MOVE_CRUNCH, MOVE_THUNDER_WAVE, MOVE_HOWL, MOVE_QUICK_ATTACK .2byte MOVE_CRUNCH, MOVE_THUNDER_WAVE, MOVE_HOWL, MOVE_QUICK_ATTACK
.byte BATTLE_FRONTIER_ITEM_SEA_INCENSE .byte BATTLE_FRONTIER_ITEM_SEA_INCENSE
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
.4byte NATURE_HASTY .4byte NATURE_HASTY
; 19 @ 19
.2byte SPECIES_MAGNEMITE .2byte SPECIES_MAGNEMITE
.2byte MOVE_THUNDER_WAVE, MOVE_SUPERSONIC, MOVE_ENDURE, MOVE_SPARK .2byte MOVE_THUNDER_WAVE, MOVE_SUPERSONIC, MOVE_ENDURE, MOVE_SPARK
.byte BATTLE_FRONTIER_ITEM_MAGNET .byte BATTLE_FRONTIER_ITEM_MAGNET
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_QUIET .4byte NATURE_QUIET
; 20 @ 20
.2byte SPECIES_VOLTORB .2byte SPECIES_VOLTORB
.2byte MOVE_CHARGE, MOVE_SPARK, MOVE_SCREECH, MOVE_SONIC_BOOM .2byte MOVE_CHARGE, MOVE_SPARK, MOVE_SCREECH, MOVE_SONIC_BOOM
.byte BATTLE_FRONTIER_ITEM_ASPEAR_BERRY .byte BATTLE_FRONTIER_ITEM_ASPEAR_BERRY
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
.4byte NATURE_MODEST .4byte NATURE_MODEST
; 21 @ 21
.2byte SPECIES_WHISMUR .2byte SPECIES_WHISMUR
.2byte MOVE_REST, MOVE_SLEEP_TALK, MOVE_HYPER_VOICE, MOVE_ATTRACT .2byte MOVE_REST, MOVE_SLEEP_TALK, MOVE_HYPER_VOICE, MOVE_ATTRACT
.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 22 @ 22
.2byte SPECIES_LOUDRED .2byte SPECIES_LOUDRED
.2byte MOVE_STOMP, MOVE_REST, MOVE_SCREECH, MOVE_UPROAR .2byte MOVE_STOMP, MOVE_REST, MOVE_SCREECH, MOVE_UPROAR
.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 23 @ 23
.2byte SPECIES_LINOONE .2byte SPECIES_LINOONE
.2byte MOVE_FURY_SWIPES, MOVE_SAND_ATTACK, MOVE_SHOCK_WAVE, MOVE_GROWL .2byte MOVE_FURY_SWIPES, MOVE_SAND_ATTACK, MOVE_SHOCK_WAVE, MOVE_GROWL
.byte BATTLE_FRONTIER_ITEM_MAGNET .byte BATTLE_FRONTIER_ITEM_MAGNET
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_MODEST .4byte NATURE_MODEST
; 24 @ 24
.2byte SPECIES_MIGHTYENA .2byte SPECIES_MIGHTYENA
.2byte MOVE_SAND_ATTACK, MOVE_HOWL, MOVE_SWAGGER, MOVE_SECRET_POWER .2byte MOVE_SAND_ATTACK, MOVE_HOWL, MOVE_SWAGGER, MOVE_SECRET_POWER
.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_JOLLY .4byte NATURE_JOLLY
; 25 @ 25
.2byte SPECIES_SWABLU .2byte SPECIES_SWABLU
.2byte MOVE_TAKE_DOWN, MOVE_SING, MOVE_GROWL, MOVE_SAFEGUARD .2byte MOVE_TAKE_DOWN, MOVE_SING, MOVE_GROWL, MOVE_SAFEGUARD
.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
.4byte NATURE_QUIRKY .4byte NATURE_QUIRKY
; 26 @ 26
.2byte SPECIES_SKARMORY .2byte SPECIES_SKARMORY
.2byte MOVE_AGILITY, MOVE_STEEL_WING, MOVE_SAND_ATTACK, MOVE_TORMENT .2byte MOVE_AGILITY, MOVE_STEEL_WING, MOVE_SAND_ATTACK, MOVE_TORMENT
.byte BATTLE_FRONTIER_ITEM_METAL_COAT .byte BATTLE_FRONTIER_ITEM_METAL_COAT
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_BOLD .4byte NATURE_BOLD
; 27 @ 27
.2byte SPECIES_GOLBAT .2byte SPECIES_GOLBAT
.2byte MOVE_CONFUSE_RAY, MOVE_BITE, MOVE_DOUBLE_TEAM, MOVE_SUBSTITUTE .2byte MOVE_CONFUSE_RAY, MOVE_BITE, MOVE_DOUBLE_TEAM, MOVE_SUBSTITUTE
.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
.4byte NATURE_BOLD .4byte NATURE_BOLD
; 28 @ 28
.2byte SPECIES_WINGULL .2byte SPECIES_WINGULL
.2byte MOVE_WING_ATTACK, MOVE_HAIL, MOVE_DOUBLE_TEAM, MOVE_SUPERSONIC .2byte MOVE_WING_ATTACK, MOVE_HAIL, MOVE_DOUBLE_TEAM, MOVE_SUPERSONIC
.byte BATTLE_FRONTIER_ITEM_RAWST_BERRY .byte BATTLE_FRONTIER_ITEM_RAWST_BERRY
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
.4byte NATURE_MODEST .4byte NATURE_MODEST
; 29 @ 29
.2byte SPECIES_PELIPPER .2byte SPECIES_PELIPPER
.2byte MOVE_TWISTER, MOVE_ICY_WIND, MOVE_DOUBLE_TEAM, MOVE_WATER_GUN .2byte MOVE_TWISTER, MOVE_ICY_WIND, MOVE_DOUBLE_TEAM, MOVE_WATER_GUN
.byte BATTLE_FRONTIER_ITEM_DRAGON_FANG .byte BATTLE_FRONTIER_ITEM_DRAGON_FANG
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 30 @ 30
.2byte SPECIES_BARBOACH .2byte SPECIES_BARBOACH
.2byte MOVE_SPARK, MOVE_WATER_GUN, MOVE_EARTHQUAKE, MOVE_WATER_SPORT .2byte MOVE_SPARK, MOVE_WATER_GUN, MOVE_EARTHQUAKE, MOVE_WATER_SPORT
.byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY .byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_MODEST .4byte NATURE_MODEST
; 31 @ 31
.2byte SPECIES_WAILMER .2byte SPECIES_WAILMER
.2byte MOVE_WATER_PULSE, MOVE_RAIN_DANCE, MOVE_SPLASH, MOVE_CURSE .2byte MOVE_WATER_PULSE, MOVE_RAIN_DANCE, MOVE_SPLASH, MOVE_CURSE
.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
.4byte NATURE_QUIET .4byte NATURE_QUIET
; 32 @ 32
.2byte SPECIES_MARILL .2byte SPECIES_MARILL
.2byte MOVE_DEFENSE_CURL, MOVE_ROLLOUT, MOVE_BUBBLE_BEAM, MOVE_ATTRACT .2byte MOVE_DEFENSE_CURL, MOVE_ROLLOUT, MOVE_BUBBLE_BEAM, MOVE_ATTRACT
.byte BATTLE_FRONTIER_ITEM_HARD_STONE .byte BATTLE_FRONTIER_ITEM_HARD_STONE
.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 33 @ 33
.2byte SPECIES_GOLDEEN .2byte SPECIES_GOLDEEN
.2byte MOVE_WATERFALL, MOVE_RAIN_DANCE, MOVE_FLAIL, MOVE_PROTECT .2byte MOVE_WATERFALL, MOVE_RAIN_DANCE, MOVE_FLAIL, MOVE_PROTECT
.byte BATTLE_FRONTIER_ITEM_GANLON_BERRY .byte BATTLE_FRONTIER_ITEM_GANLON_BERRY
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
.4byte NATURE_HASTY .4byte NATURE_HASTY
; 34 @ 34
.2byte SPECIES_GOLDEEN .2byte SPECIES_GOLDEEN
.2byte MOVE_SLEEP_TALK, MOVE_HORN_DRILL, MOVE_REST, MOVE_SUPERSONIC .2byte MOVE_SLEEP_TALK, MOVE_HORN_DRILL, MOVE_REST, MOVE_SUPERSONIC
.byte BATTLE_FRONTIER_ITEM_MENTAL_HERB .byte BATTLE_FRONTIER_ITEM_MENTAL_HERB
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
.4byte NATURE_CAREFUL .4byte NATURE_CAREFUL
; 35 @ 35
.2byte SPECIES_TRAPINCH .2byte SPECIES_TRAPINCH
.2byte MOVE_RETURN, MOVE_SAND_ATTACK, MOVE_ATTRACT, MOVE_STRENGTH .2byte MOVE_RETURN, MOVE_SAND_ATTACK, MOVE_ATTRACT, MOVE_STRENGTH
.byte BATTLE_FRONTIER_ITEM_MAGO_BERRY .byte BATTLE_FRONTIER_ITEM_MAGO_BERRY
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 36 @ 36
.2byte SPECIES_BALTOY .2byte SPECIES_BALTOY
.2byte MOVE_SELF_DESTRUCT, MOVE_SANDSTORM, MOVE_RAPID_SPIN, MOVE_MIMIC .2byte MOVE_SELF_DESTRUCT, MOVE_SANDSTORM, MOVE_RAPID_SPIN, MOVE_MIMIC
.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
.4byte NATURE_JOLLY .4byte NATURE_JOLLY
; 37 @ 37
.2byte SPECIES_GRAVELER .2byte SPECIES_GRAVELER
.2byte MOVE_ROCK_BLAST, MOVE_DEFENSE_CURL, MOVE_MAGNITUDE, MOVE_MUD_SPORT .2byte MOVE_ROCK_BLAST, MOVE_DEFENSE_CURL, MOVE_MAGNITUDE, MOVE_MUD_SPORT
.byte BATTLE_FRONTIER_ITEM_HARD_STONE .byte BATTLE_FRONTIER_ITEM_HARD_STONE
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 38 @ 38
.2byte SPECIES_SANDSHREW .2byte SPECIES_SANDSHREW
.2byte MOVE_SAND_TOMB, MOVE_SANDSTORM, MOVE_DOUBLE_TEAM, MOVE_FOCUS_PUNCH .2byte MOVE_SAND_TOMB, MOVE_SANDSTORM, MOVE_DOUBLE_TEAM, MOVE_FOCUS_PUNCH
.byte BATTLE_FRONTIER_ITEM_SOFT_SAND .byte BATTLE_FRONTIER_ITEM_SOFT_SAND
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
.4byte NATURE_JOLLY .4byte NATURE_JOLLY
; 39 @ 39
.2byte SPECIES_SWALOT .2byte SPECIES_SWALOT
.2byte MOVE_YAWN, MOVE_ENCORE, MOVE_BULLET_SEED, MOVE_SLUDGE .2byte MOVE_YAWN, MOVE_ENCORE, MOVE_BULLET_SEED, MOVE_SLUDGE
.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_BRAVE .4byte NATURE_BRAVE
; 40 @ 40
.2byte SPECIES_SHROOMISH .2byte SPECIES_SHROOMISH
.2byte MOVE_HEADBUTT, MOVE_SPORE, MOVE_SWAGGER, MOVE_LEECH_SEED .2byte MOVE_HEADBUTT, MOVE_SPORE, MOVE_SWAGGER, MOVE_LEECH_SEED
.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
.4byte NATURE_IMPISH .4byte NATURE_IMPISH
; 41 @ 41
.2byte SPECIES_KIRLIA .2byte SPECIES_KIRLIA
.2byte MOVE_HYPNOSIS, MOVE_GROWL, MOVE_ATTRACT, MOVE_DREAM_EATER .2byte MOVE_HYPNOSIS, MOVE_GROWL, MOVE_ATTRACT, MOVE_DREAM_EATER
.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 42 @ 42
.2byte SPECIES_LOMBRE .2byte SPECIES_LOMBRE
.2byte MOVE_NATURE_POWER, MOVE_WATER_GUN, MOVE_RAIN_DANCE, MOVE_FLASH .2byte MOVE_NATURE_POWER, MOVE_WATER_GUN, MOVE_RAIN_DANCE, MOVE_FLASH
.byte BATTLE_FRONTIER_ITEM_LEFTOVERS .byte BATTLE_FRONTIER_ITEM_LEFTOVERS
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
.4byte NATURE_BASHFUL .4byte NATURE_BASHFUL
; 43 @ 43
.2byte SPECIES_NUZLEAF .2byte SPECIES_NUZLEAF
.2byte MOVE_NATURE_POWER, MOVE_TORMENT, MOVE_SWAGGER, MOVE_REST .2byte MOVE_NATURE_POWER, MOVE_TORMENT, MOVE_SWAGGER, MOVE_REST
.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 44 @ 44
.2byte SPECIES_CACNEA .2byte SPECIES_CACNEA
.2byte MOVE_SANDSTORM, MOVE_NEEDLE_ARM, MOVE_TEETER_DANCE, MOVE_LEECH_SEED .2byte MOVE_SANDSTORM, MOVE_NEEDLE_ARM, MOVE_TEETER_DANCE, MOVE_LEECH_SEED
.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
data/battle_frontier/fallarbor_battle_tent_trainer_mons.s
+30 -30
View File
@@ -1,6 +1,6 @@
.align 1, 0 .align 1, 0
gFallarborBattleTentTrainerMons_Amber: ; 85DEEF8 gFallarborBattleTentTrainerMons_Amber: @ 85DEEF8
.2byte 39 .2byte 39
.2byte 40 .2byte 40
.2byte 41 .2byte 41
@@ -9,7 +9,7 @@ gFallarborBattleTentTrainerMons_Amber: ; 85DEEF8
.2byte 44 .2byte 44
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Javier: ; 85DEF06 gFallarborBattleTentTrainerMons_Javier: @ 85DEF06
.2byte 6 .2byte 6
.2byte 35 .2byte 35
.2byte 36 .2byte 36
@@ -18,7 +18,7 @@ gFallarborBattleTentTrainerMons_Javier: ; 85DEF06
.2byte 44 .2byte 44
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Natalie: ; 85DEF14 gFallarborBattleTentTrainerMons_Natalie: @ 85DEF14
.2byte 5 .2byte 5
.2byte 29 .2byte 29
.2byte 30 .2byte 30
@@ -26,7 +26,7 @@ gFallarborBattleTentTrainerMons_Natalie: ; 85DEF14
.2byte 34 .2byte 34
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Treve: ; 85DEF20 gFallarborBattleTentTrainerMons_Treve: @ 85DEF20
.2byte 28 .2byte 28
.2byte 29 .2byte 29
.2byte 30 .2byte 30
@@ -34,7 +34,7 @@ gFallarborBattleTentTrainerMons_Treve: ; 85DEF20
.2byte 33 .2byte 33
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Arianna: ; 85DEF2C gFallarborBattleTentTrainerMons_Arianna: @ 85DEF2C
.2byte 18 .2byte 18
.2byte 23 .2byte 23
.2byte 24 .2byte 24
@@ -42,7 +42,7 @@ gFallarborBattleTentTrainerMons_Arianna: ; 85DEF2C
.2byte 44 .2byte 44
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Jadyn: ; 85DEF38 gFallarborBattleTentTrainerMons_Jadyn: @ 85DEF38
.2byte 0 .2byte 0
.2byte 22 .2byte 22
.2byte 24 .2byte 24
@@ -51,7 +51,7 @@ gFallarborBattleTentTrainerMons_Jadyn: ; 85DEF38
.2byte 39 .2byte 39
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Gerardo: ; 85DEF46 gFallarborBattleTentTrainerMons_Gerardo: @ 85DEF46
.2byte 6 .2byte 6
.2byte 18 .2byte 18
.2byte 23 .2byte 23
@@ -59,7 +59,7 @@ gFallarborBattleTentTrainerMons_Gerardo: ; 85DEF46
.2byte 29 .2byte 29
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Jonn: ; 85DEF52 gFallarborBattleTentTrainerMons_Jonn: @ 85DEF52
.2byte 16 .2byte 16
.2byte 17 .2byte 17
.2byte 21 .2byte 21
@@ -67,7 +67,7 @@ gFallarborBattleTentTrainerMons_Jonn: ; 85DEF52
.2byte 37 .2byte 37
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Esteban: ; 85DEF5E gFallarborBattleTentTrainerMons_Esteban: @ 85DEF5E
.2byte 5 .2byte 5
.2byte 28 .2byte 28
.2byte 30 .2byte 30
@@ -75,7 +75,7 @@ gFallarborBattleTentTrainerMons_Esteban: ; 85DEF5E
.2byte 42 .2byte 42
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Jameson: ; 85DEF6A gFallarborBattleTentTrainerMons_Jameson: @ 85DEF6A
.2byte 1 .2byte 1
.2byte 2 .2byte 2
.2byte 3 .2byte 3
@@ -83,7 +83,7 @@ gFallarborBattleTentTrainerMons_Jameson: ; 85DEF6A
.2byte 9 .2byte 9
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Alanzo: ; 85DEF76 gFallarborBattleTentTrainerMons_Alanzo: @ 85DEF76
.2byte 9 .2byte 9
.2byte 10 .2byte 10
.2byte 11 .2byte 11
@@ -93,7 +93,7 @@ gFallarborBattleTentTrainerMons_Alanzo: ; 85DEF76
.2byte 15 .2byte 15
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Howard: ; 85DEF86 gFallarborBattleTentTrainerMons_Howard: @ 85DEF86
.2byte 18 .2byte 18
.2byte 23 .2byte 23
.2byte 31 .2byte 31
@@ -101,7 +101,7 @@ gFallarborBattleTentTrainerMons_Howard: ; 85DEF86
.2byte 43 .2byte 43
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Conrad: ; 85DEF92 gFallarborBattleTentTrainerMons_Conrad: @ 85DEF92
.2byte 18 .2byte 18
.2byte 19 .2byte 19
.2byte 20 .2byte 20
@@ -109,7 +109,7 @@ gFallarborBattleTentTrainerMons_Conrad: ; 85DEF92
.2byte 22 .2byte 22
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Makenna: ; 85DEF9E gFallarborBattleTentTrainerMons_Makenna: @ 85DEF9E
.2byte 4 .2byte 4
.2byte 21 .2byte 21
.2byte 25 .2byte 25
@@ -117,7 +117,7 @@ gFallarborBattleTentTrainerMons_Makenna: ; 85DEF9E
.2byte 40 .2byte 40
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Brayan: ; 85DEFAA gFallarborBattleTentTrainerMons_Brayan: @ 85DEFAA
.2byte 0 .2byte 0
.2byte 4 .2byte 4
.2byte 6 .2byte 6
@@ -127,7 +127,7 @@ gFallarborBattleTentTrainerMons_Brayan: ; 85DEFAA
.2byte 28 .2byte 28
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Mariana: ; 85DEFBA gFallarborBattleTentTrainerMons_Mariana: @ 85DEFBA
.2byte 0 .2byte 0
.2byte 4 .2byte 4
.2byte 13 .2byte 13
@@ -137,7 +137,7 @@ gFallarborBattleTentTrainerMons_Mariana: ; 85DEFBA
.2byte 37 .2byte 37
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Sheldon: ; 85DEFCA gFallarborBattleTentTrainerMons_Sheldon: @ 85DEFCA
.2byte 2 .2byte 2
.2byte 3 .2byte 3
.2byte 21 .2byte 21
@@ -145,7 +145,7 @@ gFallarborBattleTentTrainerMons_Sheldon: ; 85DEFCA
.2byte 39 .2byte 39
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Gianna: ; 85DEFD6 gFallarborBattleTentTrainerMons_Gianna: @ 85DEFD6
.2byte 1 .2byte 1
.2byte 2 .2byte 2
.2byte 30 .2byte 30
@@ -153,7 +153,7 @@ gFallarborBattleTentTrainerMons_Gianna: ; 85DEFD6
.2byte 41 .2byte 41
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Yahir: ; 85DEFE2 gFallarborBattleTentTrainerMons_Yahir: @ 85DEFE2
.2byte 4 .2byte 4
.2byte 8 .2byte 8
.2byte 15 .2byte 15
@@ -162,7 +162,7 @@ gFallarborBattleTentTrainerMons_Yahir: ; 85DEFE2
.2byte 24 .2byte 24
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Britney: ; 85DEFF0 gFallarborBattleTentTrainerMons_Britney: @ 85DEFF0
.2byte 4 .2byte 4
.2byte 7 .2byte 7
.2byte 14 .2byte 14
@@ -171,7 +171,7 @@ gFallarborBattleTentTrainerMons_Britney: ; 85DEFF0
.2byte 43 .2byte 43
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Hecter: ; 85DEFFE gFallarborBattleTentTrainerMons_Hecter: @ 85DEFFE
.2byte 0 .2byte 0
.2byte 1 .2byte 1
.2byte 2 .2byte 2
@@ -180,7 +180,7 @@ gFallarborBattleTentTrainerMons_Hecter: ; 85DEFFE
.2byte 35 .2byte 35
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Tannor: ; 85DF00C gFallarborBattleTentTrainerMons_Tannor: @ 85DF00C
.2byte 5 .2byte 5
.2byte 30 .2byte 30
.2byte 31 .2byte 31
@@ -188,7 +188,7 @@ gFallarborBattleTentTrainerMons_Tannor: ; 85DF00C
.2byte 34 .2byte 34
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Benji: ; 85DF018 gFallarborBattleTentTrainerMons_Benji: @ 85DF018
.2byte 25 .2byte 25
.2byte 26 .2byte 26
.2byte 27 .2byte 27
@@ -196,7 +196,7 @@ gFallarborBattleTentTrainerMons_Benji: ; 85DF018
.2byte 29 .2byte 29
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Rory: ; 85DF024 gFallarborBattleTentTrainerMons_Rory: @ 85DF024
.2byte 9 .2byte 9
.2byte 11 .2byte 11
.2byte 14 .2byte 14
@@ -205,7 +205,7 @@ gFallarborBattleTentTrainerMons_Rory: ; 85DF024
.2byte 39 .2byte 39
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Eleanor: ; 85DF032 gFallarborBattleTentTrainerMons_Eleanor: @ 85DF032
.2byte 23 .2byte 23
.2byte 28 .2byte 28
.2byte 31 .2byte 31
@@ -215,7 +215,7 @@ gFallarborBattleTentTrainerMons_Eleanor: ; 85DF032
.2byte 44 .2byte 44
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Evelyn: ; 85DF042 gFallarborBattleTentTrainerMons_Evelyn: @ 85DF042
.2byte 29 .2byte 29
.2byte 31 .2byte 31
.2byte 32 .2byte 32
@@ -223,7 +223,7 @@ gFallarborBattleTentTrainerMons_Evelyn: ; 85DF042
.2byte 34 .2byte 34
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Arielle: ; 85DF04E gFallarborBattleTentTrainerMons_Arielle: @ 85DF04E
.2byte 1 .2byte 1
.2byte 3 .2byte 3
.2byte 38 .2byte 38
@@ -231,7 +231,7 @@ gFallarborBattleTentTrainerMons_Arielle: ; 85DF04E
.2byte 41 .2byte 41
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Connar: ; 85DF05A gFallarborBattleTentTrainerMons_Connar: @ 85DF05A
.2byte 7 .2byte 7
.2byte 8 .2byte 8
.2byte 28 .2byte 28
@@ -240,7 +240,7 @@ gFallarborBattleTentTrainerMons_Connar: ; 85DF05A
.2byte 32 .2byte 32
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Maurice: ; 85DF068 gFallarborBattleTentTrainerMons_Maurice: @ 85DF068
.2byte 4 .2byte 4
.2byte 5 .2byte 5
.2byte 6 .2byte 6
@@ -248,7 +248,7 @@ gFallarborBattleTentTrainerMons_Maurice: ; 85DF068
.2byte 13 .2byte 13
.2byte -1 .2byte -1
gFallarborBattleTentTrainerMons_Kianna: ; 85DF074 gFallarborBattleTentTrainerMons_Kianna: @ 85DF074
.2byte 22 .2byte 22
.2byte 24 .2byte 24
.2byte 26 .2byte 26
data/battle_frontier/fallarbor_battle_tent_trainers.s
+121 -121
View File
@@ -1,24 +1,24 @@
.align 2, 0 .align 2, 0
gFallarborBattleTentTrainers: ; 85DF084 gFallarborBattleTentTrainers: @ 85DF084
; 0 @ 0
.4byte TRAINER_CLASS_AROMA_LADY .4byte TRAINER_CLASS_AROMA_LADY
.charmapstr "AMBER$", 8 .charmapstr "AMBER$", 8
; pre-battle speech @ pre-battle speech
ec_word I ec_word I
ec_word HAVE ec_word HAVE
ec_word TO ec_word TO
ec_word DIET ec_word DIET
ec_word EVERY ec_word EVERY
ec_word DAY ec_word DAY
; win speech @ win speech
ec_word A ec_word A
ec_move1 NIGHTMARE ec_move1 NIGHTMARE
ec_word OF ec_word OF
ec_word SWEETS ec_word SWEETS
ec_word SHOCKED ec_word SHOCKED
ec_word ME ec_word ME
; loss speech @ loss speech
ec_word IF ec_word IF
ec_word YOU ec_word YOU
ec_word GIVE_UP ec_word GIVE_UP
@@ -27,24 +27,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word LOSE ec_word LOSE
.4byte gFallarborBattleTentTrainerMons_Amber .4byte gFallarborBattleTentTrainerMons_Amber
; 1 @ 1
.4byte TRAINER_CLASS_RUIN_MANIAC .4byte TRAINER_CLASS_RUIN_MANIAC
.charmapstr "JAVIER$", 8 .charmapstr "JAVIER$", 8
; pre-battle speech @ pre-battle speech
ec_word I ec_word I
ec_word NEVER ec_word NEVER
ec_word EVER ec_word EVER
ec_word HAVE ec_word HAVE
ec_word ENOUGH ec_word ENOUGH
ec_word MONEY ec_word MONEY
; win speech @ win speech
ec_word I ec_word I
ec_word WON ec_word WON
ec_word BUT ec_word BUT
ec_word I ec_word I
ec_word NEED ec_word NEED
ec_word MONEY ec_word MONEY
; loss speech @ loss speech
ec_word I ec_word I
ec_word NEED ec_word NEED
ec_word MONEY ec_word MONEY
@@ -53,24 +53,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word BIKE ec_word BIKE
.4byte gFallarborBattleTentTrainerMons_Javier .4byte gFallarborBattleTentTrainerMons_Javier
; 2 @ 2
.4byte TRAINER_CLASS_TUBER_1 .4byte TRAINER_CLASS_TUBER_1
.charmapstr "NATALIE$", 8 .charmapstr "NATALIE$", 8
; pre-battle speech @ pre-battle speech
ec_word THE ec_word THE
ec_word WAY ec_word WAY
ec_word I ec_word I
ec_word BATTLE ec_word BATTLE
ec_word IS ec_word IS
ec_word WEIRD ec_word WEIRD
; win speech @ win speech
ec_word YOU_RE ec_word YOU_RE
ec_word MUCH ec_word MUCH
ec_word TOO_WEAK ec_word TOO_WEAK
ec_word FOR ec_word FOR
ec_word THIS ec_word THIS
ec_word PLACE ec_word PLACE
; loss speech @ loss speech
ec_word GIVE_ME ec_word GIVE_ME
ec_word AN ec_word AN
ec_word EASY ec_word EASY
@@ -79,24 +79,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word TIME ec_word TIME
.4byte gFallarborBattleTentTrainerMons_Natalie .4byte gFallarborBattleTentTrainerMons_Natalie
; 3 @ 3
.4byte TRAINER_CLASS_TUBER_2 .4byte TRAINER_CLASS_TUBER_2
.charmapstr "TREVE$", 8 .charmapstr "TREVE$", 8
; pre-battle speech @ pre-battle speech
ec_word LOOK ec_word LOOK
ec_word AT ec_word AT
ec_word MY ec_word MY
ec_move2 METRONOME ec_move2 METRONOME
ec_word AND ec_word AND
ec_word SLEEP ec_word SLEEP
; win speech @ win speech
ec_word YEAH ec_word YEAH
ec_word EXCL ec_word EXCL
ec_move1 HYPNOSIS ec_move1 HYPNOSIS
ec_word IS ec_word IS
ec_word TOTALLY ec_word TOTALLY
ec_word GREAT ec_word GREAT
; loss speech @ loss speech
ec_word MY ec_word MY
ec_move1 HYPNOSIS ec_move1 HYPNOSIS
ec_word DIDN_T ec_word DIDN_T
@@ -105,24 +105,24 @@ gFallarborBattleTentTrainers: ; 85DF084
.2byte -1 .2byte -1
.4byte gFallarborBattleTentTrainerMons_Treve .4byte gFallarborBattleTentTrainerMons_Treve
; 4 @ 4
.4byte TRAINER_CLASS_LADY .4byte TRAINER_CLASS_LADY
.charmapstr "ARIANNA$", 8 .charmapstr "ARIANNA$", 8
; pre-battle speech @ pre-battle speech
ec_word IF_I_WIN ec_word IF_I_WIN
ec_word GIVE_ME ec_word GIVE_ME
ec_word POKEMON ec_word POKEMON
ec_word FOR ec_word FOR
ec_word MY ec_word MY
ec_word COLLECTION ec_word COLLECTION
; win speech @ win speech
ec_word YOUR ec_word YOUR
ec_word POKEMON ec_word POKEMON
ec_word ARE ec_word ARE
ec_word TOO_WEAK ec_word TOO_WEAK
ec_word TO ec_word TO
ec_word COLLECT ec_word COLLECT
; loss speech @ loss speech
ec_word YOUR ec_word YOUR
ec_word POKEMON ec_word POKEMON
ec_word ARE ec_word ARE
@@ -131,24 +131,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word ELLIPSIS ec_word ELLIPSIS
.4byte gFallarborBattleTentTrainerMons_Arianna .4byte gFallarborBattleTentTrainerMons_Arianna
; 5 @ 5
.4byte TRAINER_CLASS_BEAUTY .4byte TRAINER_CLASS_BEAUTY
.charmapstr "JADYN$", 8 .charmapstr "JADYN$", 8
; pre-battle speech @ pre-battle speech
ec_word MY ec_word MY
ec_word NAME ec_word NAME
ec_word IS ec_word IS
ec_word REALLY ec_word REALLY
ec_word A ec_word A
ec_word MYSTERY ec_word MYSTERY
; win speech @ win speech
ec_word MY ec_word MY
ec_word NAME ec_word NAME
ec_word GOES ec_word GOES
ec_word ON ec_word ON
ec_word A ec_word A
ec_word MYSTERY ec_word MYSTERY
; loss speech @ loss speech
ec_word MY ec_word MY
ec_word NAME ec_word NAME
ec_word QUES ec_word QUES
@@ -157,24 +157,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word MOTHER ec_word MOTHER
.4byte gFallarborBattleTentTrainerMons_Jadyn .4byte gFallarborBattleTentTrainerMons_Jadyn
; 6 @ 6
.4byte TRAINER_CLASS_RICH_BOY .4byte TRAINER_CLASS_RICH_BOY
.charmapstr "GERARDO$", 8 .charmapstr "GERARDO$", 8
; pre-battle speech @ pre-battle speech
ec_word I_AM ec_word I_AM
ec_word THE ec_word THE
ec_word BEST ec_word BEST
ec_word HERO ec_word HERO
ec_word EVER ec_word EVER
ec_word EXCL ec_word EXCL
; win speech @ win speech
ec_word SEE ec_word SEE
ec_word WHAT ec_word WHAT
ec_word I ec_word I
ec_word MEAN ec_word MEAN
ec_word QUES ec_word QUES
.2byte -1 .2byte -1
; loss speech @ loss speech
ec_word HUH_QUES ec_word HUH_QUES
ec_word YOU ec_word YOU
ec_word WERE ec_word WERE
@@ -183,24 +183,24 @@ gFallarborBattleTentTrainers: ; 85DF084
.2byte -1 .2byte -1
.4byte gFallarborBattleTentTrainerMons_Gerardo .4byte gFallarborBattleTentTrainerMons_Gerardo
; 7 @ 7
.4byte TRAINER_CLASS_POKEMANIAC .4byte TRAINER_CLASS_POKEMANIAC
.charmapstr "JONN$", 8 .charmapstr "JONN$", 8
; pre-battle speech @ pre-battle speech
ec_word THE ec_word THE
ec_word WORLD ec_word WORLD
ec_move2 SUPERPOWER ec_move2 SUPERPOWER
ec_move2 STOMP ec_move2 STOMP
ec_word CONTEST ec_word CONTEST
ec_word EXCL_EXCL ec_word EXCL_EXCL
; win speech @ win speech
ec_word I_AM ec_word I_AM
ec_word NO_1 ec_word NO_1
ec_word EXCL_EXCL ec_word EXCL_EXCL
ec_word HEAR ec_word HEAR
ec_word ME ec_word ME
ec_move2 ROAR ec_move2 ROAR
; loss speech @ loss speech
ec_word I ec_word I
ec_word GIVE_UP ec_word GIVE_UP
ec_word EXCL ec_word EXCL
@@ -209,24 +209,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word EXCL ec_word EXCL
.4byte gFallarborBattleTentTrainerMons_Jonn .4byte gFallarborBattleTentTrainerMons_Jonn
; 8 @ 8
.4byte TRAINER_CLASS_SWIMMER_M .4byte TRAINER_CLASS_SWIMMER_M
.charmapstr "ESTEBAN$", 8 .charmapstr "ESTEBAN$", 8
; pre-battle speech @ pre-battle speech
ec_word YOU_RE ec_word YOU_RE
ec_word A ec_word A
ec_word GOOD ec_word GOOD
ec_word TRAINER ec_word TRAINER
ec_word QUES ec_word QUES
ec_word UNBELIEVABLE ec_word UNBELIEVABLE
; win speech @ win speech
ec_word YOU_RE ec_word YOU_RE
ec_word SOME ec_word SOME
ec_word PUSHOVER ec_word PUSHOVER
ec_word OF ec_word OF
ec_word A ec_word A
ec_word TRAINER ec_word TRAINER
; loss speech @ loss speech
ec_word YOU_RE ec_word YOU_RE
ec_word MUCH ec_word MUCH
ec_word TOO ec_word TOO
@@ -235,24 +235,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word ME ec_word ME
.4byte gFallarborBattleTentTrainerMons_Esteban .4byte gFallarborBattleTentTrainerMons_Esteban
; 9 @ 9
.4byte TRAINER_CLASS_CAMPER .4byte TRAINER_CLASS_CAMPER
.charmapstr "JAMESON$", 8 .charmapstr "JAMESON$", 8
; pre-battle speech @ pre-battle speech
ec_word MY ec_word MY
ec_word POKEMON ec_word POKEMON
ec_word ARE ec_word ARE
ec_word SILKY ec_word SILKY
ec_word SMOOTH ec_word SMOOTH
ec_word EXCL ec_word EXCL
; win speech @ win speech
ec_word MY ec_word MY
ec_word SILKY ec_word SILKY
ec_word SMOOTH ec_word SMOOTH
ec_word POKEMON ec_word POKEMON
ec_word RULE ec_word RULE
ec_word EXCL ec_word EXCL
; loss speech @ loss speech
ec_word MY ec_word MY
ec_word POKEMON ec_word POKEMON
ec_move2 STRUGGLE ec_move2 STRUGGLE
@@ -261,24 +261,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word STICKY_HOLD ec_word STICKY_HOLD
.4byte gFallarborBattleTentTrainerMons_Jameson .4byte gFallarborBattleTentTrainerMons_Jameson
; 10 @ 10
.4byte TRAINER_CLASS_BUG_MANIAC .4byte TRAINER_CLASS_BUG_MANIAC
.charmapstr "ALANZO$", 8 .charmapstr "ALANZO$", 8
; pre-battle speech @ pre-battle speech
ec_move2 FORESIGHT ec_move2 FORESIGHT
ec_word IS ec_word IS
ec_word A ec_word A
ec_word POWER ec_word POWER
ec_word I ec_word I
ec_word HAVE ec_word HAVE
; win speech @ win speech
ec_word YOU_RE ec_word YOU_RE
ec_word OBLIVIOUS ec_word OBLIVIOUS
ec_word ABOUT ec_word ABOUT
ec_move2 FORESIGHT ec_move2 FORESIGHT
ec_word EXCL ec_word EXCL
.2byte -1 .2byte -1
; loss speech @ loss speech
ec_word MY ec_word MY
ec_move2 FORESIGHT ec_move2 FORESIGHT
ec_word IS ec_word IS
@@ -287,24 +287,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word EXCL ec_word EXCL
.4byte gFallarborBattleTentTrainerMons_Alanzo .4byte gFallarborBattleTentTrainerMons_Alanzo
; 11 @ 11
.4byte TRAINER_CLASS_GENTLEMAN .4byte TRAINER_CLASS_GENTLEMAN
.charmapstr "HOWARD$", 8 .charmapstr "HOWARD$", 8
; pre-battle speech @ pre-battle speech
ec_word YOUR ec_word YOUR
ec_word POKEMON ec_word POKEMON
ec_word CAN_T ec_word CAN_T
ec_word BEAT ec_word BEAT
ec_word ME ec_word ME
.2byte -1 .2byte -1
; win speech @ win speech
ec_word YOU ec_word YOU
ec_word COULDN_T ec_word COULDN_T
ec_word WIN ec_word WIN
ec_word COULD ec_word COULD
ec_word YOU ec_word YOU
ec_word QUES ec_word QUES
; loss speech @ loss speech
ec_word YOU ec_word YOU
ec_word WOULD ec_word WOULD
ec_word GO ec_word GO
@@ -313,24 +313,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word ELLIPSIS ec_word ELLIPSIS
.4byte gFallarborBattleTentTrainerMons_Howard .4byte gFallarborBattleTentTrainerMons_Howard
; 12 @ 12
.4byte TRAINER_CLASS_GUITARIST .4byte TRAINER_CLASS_GUITARIST
.charmapstr "CONRAD$", 8 .charmapstr "CONRAD$", 8
; pre-battle speech @ pre-battle speech
ec_word YOUR ec_word YOUR
ec_word POKEMON ec_word POKEMON
ec_word ARE ec_word ARE
ec_word PRETTY ec_word PRETTY
ec_word WILD ec_word WILD
ec_word EXCL ec_word EXCL
; win speech @ win speech
ec_word WHOAH ec_word WHOAH
ec_word EXCL_EXCL ec_word EXCL_EXCL
.2byte -1 .2byte -1
ec_word LET_S ec_word LET_S
ec_word DANCE ec_word DANCE
ec_word EXCL ec_word EXCL
; loss speech @ loss speech
ec_word MY ec_word MY
ec_word MUSIC ec_word MUSIC
ec_word WILL ec_word WILL
@@ -339,24 +339,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word ELLIPSIS ec_word ELLIPSIS
.4byte gFallarborBattleTentTrainerMons_Conrad .4byte gFallarborBattleTentTrainerMons_Conrad
; 13 @ 13
.4byte TRAINER_CLASS_SCHOOL_KID_2 .4byte TRAINER_CLASS_SCHOOL_KID_2
.charmapstr "MAKENNA$", 8 .charmapstr "MAKENNA$", 8
; pre-battle speech @ pre-battle speech
ec_word SHOW ec_word SHOW
ec_word ME ec_word ME
ec_word THAT ec_word THAT
ec_word YOU ec_word YOU
ec_word MEAN ec_word MEAN
ec_word IT ec_word IT
; win speech @ win speech
ec_word THAT_S ec_word THAT_S
ec_word WHY ec_word WHY
ec_word I ec_word I
ec_word STUDY ec_word STUDY
ec_word EVERY ec_word EVERY
ec_word DAY ec_word DAY
; loss speech @ loss speech
ec_word AWW ec_word AWW
ec_word I ec_word I
ec_word STUDY ec_word STUDY
@@ -365,24 +365,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word TOO ec_word TOO
.4byte gFallarborBattleTentTrainerMons_Makenna .4byte gFallarborBattleTentTrainerMons_Makenna
; 14 @ 14
.4byte TRAINER_CLASS_COOLTRAINER_1 .4byte TRAINER_CLASS_COOLTRAINER_1
.charmapstr "BRAYAN$", 8 .charmapstr "BRAYAN$", 8
; pre-battle speech @ pre-battle speech
ec_word CAN ec_word CAN
ec_word YOU ec_word YOU
ec_word SEE ec_word SEE
ec_word MY ec_word MY
ec_word POWER ec_word POWER
ec_word QUES ec_word QUES
; win speech @ win speech
ec_word HOW ec_word HOW
ec_word BORING ec_word BORING
ec_word ELLIPSIS ec_word ELLIPSIS
ec_word THIS ec_word THIS
ec_word IS ec_word IS
ec_word GOOD_BYE ec_word GOOD_BYE
; loss speech @ loss speech
ec_word AM ec_word AM
ec_word I ec_word I
ec_word THE ec_word THE
@@ -391,24 +391,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word QUES ec_word QUES
.4byte gFallarborBattleTentTrainerMons_Brayan .4byte gFallarborBattleTentTrainerMons_Brayan
; 15 @ 15
.4byte TRAINER_CLASS_COOLTRAINER_2 .4byte TRAINER_CLASS_COOLTRAINER_2
.charmapstr "MARIANA$", 8 .charmapstr "MARIANA$", 8
; pre-battle speech @ pre-battle speech
ec_word A ec_word A
ec_word LIE ec_word LIE
ec_word CAN ec_word CAN
ec_word BE ec_word BE
ec_word KIND ec_word KIND
ec_word ELLIPSIS ec_word ELLIPSIS
; win speech @ win speech
ec_word THIS ec_word THIS
ec_word IS ec_word IS
ec_word LIKE ec_word LIKE
ec_word THE ec_word THE
ec_word SUNDAY ec_word SUNDAY
ec_word COMICS ec_word COMICS
; loss speech @ loss speech
ec_word THIS ec_word THIS
ec_word IS ec_word IS
ec_word LIKE ec_word LIKE
@@ -417,24 +417,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word MOVIE ec_word MOVIE
.4byte gFallarborBattleTentTrainerMons_Mariana .4byte gFallarborBattleTentTrainerMons_Mariana
; 16 @ 16
.4byte TRAINER_CLASS_POKEFAN_1 .4byte TRAINER_CLASS_POKEFAN_1
.charmapstr "SHELDON$", 8 .charmapstr "SHELDON$", 8
; pre-battle speech @ pre-battle speech
ec_word A ec_word A
ec_word POKEMON ec_word POKEMON
ec_word TEACHER ec_word TEACHER
ec_word GETS ec_word GETS
ec_word NO ec_word NO
ec_move2 REST ec_move2 REST
; win speech @ win speech
ec_word MY ec_word MY
ec_word SMARTNESS ec_word SMARTNESS
ec_word GETS ec_word GETS
ec_word ME ec_word ME
ec_word EASY ec_word EASY
ec_word WINS ec_word WINS
; loss speech @ loss speech
ec_word I ec_word I
ec_word HAVE ec_word HAVE
ec_word TO ec_word TO
@@ -443,24 +443,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word BYE_BYE ec_word BYE_BYE
.4byte gFallarborBattleTentTrainerMons_Sheldon .4byte gFallarborBattleTentTrainerMons_Sheldon
; 17 @ 17
.4byte TRAINER_CLASS_POKEFAN_2 .4byte TRAINER_CLASS_POKEFAN_2
.charmapstr "GIANNA$", 8 .charmapstr "GIANNA$", 8
; pre-battle speech @ pre-battle speech
ec_word AHAHA ec_word AHAHA
ec_word YES ec_word YES
ec_word EXCL ec_word EXCL
ec_word LOVEY_DOVEY ec_word LOVEY_DOVEY
ec_word POKEMON ec_word POKEMON
ec_word WORLD ec_word WORLD
; win speech @ win speech
ec_word MY ec_word MY
ec_word SHINE ec_word SHINE
ec_word IS ec_word IS
ec_word MAKING ec_word MAKING
ec_word THINGS ec_word THINGS
ec_word BETTER ec_word BETTER
; loss speech @ loss speech
ec_word DO ec_word DO
ec_word YOU ec_word YOU
ec_word DISLIKE ec_word DISLIKE
@@ -469,24 +469,24 @@ gFallarborBattleTentTrainers: ; 85DF084
.2byte -1 .2byte -1
.4byte gFallarborBattleTentTrainerMons_Gianna .4byte gFallarborBattleTentTrainerMons_Gianna
; 18 @ 18
.4byte TRAINER_CLASS_EXPERT_1 .4byte TRAINER_CLASS_EXPERT_1
.charmapstr "YAHIR$", 8 .charmapstr "YAHIR$", 8
; pre-battle speech @ pre-battle speech
ec_word YOU ec_word YOU
ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
ec_word COME_ON ec_word COME_ON
ec_word EXCL ec_word EXCL
; win speech @ win speech
ec_word YOU ec_word YOU
ec_word NEED ec_word NEED
ec_word TO ec_word TO
ec_word TRAIN ec_word TRAIN
ec_word A_LOT ec_word A_LOT
ec_word MORE ec_word MORE
; loss speech @ loss speech
ec_word NOT ec_word NOT
ec_word ENOUGH ec_word ENOUGH
ec_word ELLIPSIS ec_word ELLIPSIS
@@ -495,24 +495,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word ENOUGH ec_word ENOUGH
.4byte gFallarborBattleTentTrainerMons_Yahir .4byte gFallarborBattleTentTrainerMons_Yahir
; 19 @ 19
.4byte TRAINER_CLASS_EXPERT_2 .4byte TRAINER_CLASS_EXPERT_2
.charmapstr "BRITNEY$", 8 .charmapstr "BRITNEY$", 8
; pre-battle speech @ pre-battle speech
ec_word IT ec_word IT
ec_word SEEMS ec_word SEEMS
ec_word THAT ec_word THAT
ec_word YOU_RE ec_word YOU_RE
ec_word QUITE ec_word QUITE
ec_word GOOD ec_word GOOD
; win speech @ win speech
ec_word YOU_RE ec_word YOU_RE
ec_word A ec_word A
ec_word LUKEWARM ec_word LUKEWARM
ec_word TALENT ec_word TALENT
ec_word AT ec_word AT
ec_word BEST ec_word BEST
; loss speech @ loss speech
ec_word YOU_RE ec_word YOU_RE
ec_word A ec_word A
ec_word COOL ec_word COOL
@@ -521,24 +521,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word THIS ec_word THIS
.4byte gFallarborBattleTentTrainerMons_Britney .4byte gFallarborBattleTentTrainerMons_Britney
; 20 @ 20
.4byte TRAINER_CLASS_YOUNGSTER .4byte TRAINER_CLASS_YOUNGSTER
.charmapstr "HECTER$", 8 .charmapstr "HECTER$", 8
; pre-battle speech @ pre-battle speech
ec_word MY ec_word MY
ec_move2 HIDDEN_POWER ec_move2 HIDDEN_POWER
ec_word IS ec_word IS
ec_word EXCITING ec_word EXCITING
ec_word ME ec_word ME
ec_word EXCL ec_word EXCL
; win speech @ win speech
ec_word YEEHAW_EXCL ec_word YEEHAW_EXCL
ec_word LET_S ec_word LET_S
ec_word HAVE ec_word HAVE
ec_word A ec_word A
ec_move2 HIDDEN_POWER ec_move2 HIDDEN_POWER
ec_word PARTY ec_word PARTY
; loss speech @ loss speech
ec_word WAAAH ec_word WAAAH
ec_word EXCL ec_word EXCL
ec_word DON_T ec_word DON_T
@@ -547,24 +547,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word ME ec_word ME
.4byte gFallarborBattleTentTrainerMons_Hecter .4byte gFallarborBattleTentTrainerMons_Hecter
; 21 @ 21
.4byte TRAINER_CLASS_FISHERMAN .4byte TRAINER_CLASS_FISHERMAN
.charmapstr "TANNOR$", 8 .charmapstr "TANNOR$", 8
; pre-battle speech @ pre-battle speech
ec_word YOU ec_word YOU
ec_word HAVE ec_word HAVE
ec_word GOT ec_word GOT
ec_word TO ec_word TO
ec_word BE ec_word BE
ec_word JOKING ec_word JOKING
; win speech @ win speech
ec_word YOU_RE ec_word YOU_RE
ec_word THE ec_word THE
ec_word BEST ec_word BEST
ec_word AT ec_word AT
ec_word BEING ec_word BEING
ec_word FUNNY ec_word FUNNY
; loss speech @ loss speech
ec_word YOU ec_word YOU
ec_word WEREN_T ec_word WEREN_T
ec_word BEING ec_word BEING
@@ -573,24 +573,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word ALL ec_word ALL
.4byte gFallarborBattleTentTrainerMons_Tannor .4byte gFallarborBattleTentTrainerMons_Tannor
; 22 @ 22
.4byte TRAINER_CLASS_BIRD_KEEPER .4byte TRAINER_CLASS_BIRD_KEEPER
.charmapstr "BENJI$", 8 .charmapstr "BENJI$", 8
; pre-battle speech @ pre-battle speech
ec_word YOU ec_word YOU
ec_word DON_T ec_word DON_T
ec_word THINK ec_word THINK
ec_word VERY ec_word VERY
ec_word FAST ec_word FAST
ec_word HUH_QUES ec_word HUH_QUES
; win speech @ win speech
ec_word SORRY ec_word SORRY
ec_word EXCL ec_word EXCL
ec_word I ec_word I
ec_word DIDN_T ec_word DIDN_T
ec_word MEAN ec_word MEAN
ec_word YOU ec_word YOU
; loss speech @ loss speech
ec_word YOU ec_word YOU
ec_word LEFT ec_word LEFT
ec_word ME ec_word ME
@@ -599,24 +599,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word ELLIPSIS ec_word ELLIPSIS
.4byte gFallarborBattleTentTrainerMons_Benji .4byte gFallarborBattleTentTrainerMons_Benji
; 23 @ 23
.4byte TRAINER_CLASS_NINJA_BOY .4byte TRAINER_CLASS_NINJA_BOY
.charmapstr "RORY$", 8 .charmapstr "RORY$", 8
; pre-battle speech @ pre-battle speech
ec_word DON_T ec_word DON_T
ec_word CAUSE ec_word CAUSE
ec_word AN ec_word AN
ec_move1 UPROAR ec_move1 UPROAR
ec_word YOU ec_word YOU
ec_word EXCL ec_word EXCL
; win speech @ win speech
ec_word I ec_word I
ec_word DON_T ec_word DON_T
ec_word NEED ec_word NEED
ec_word AN ec_word AN
ec_move1 UPROAR ec_move1 UPROAR
ec_word EXCL ec_word EXCL
; loss speech @ loss speech
ec_word I_AM ec_word I_AM
ec_word GOING ec_word GOING
ec_word TO ec_word TO
@@ -625,24 +625,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_move1 UPROAR ec_move1 UPROAR
.4byte gFallarborBattleTentTrainerMons_Rory .4byte gFallarborBattleTentTrainerMons_Rory
; 24 @ 24
.4byte TRAINER_CLASS_PARASOL_LADY .4byte TRAINER_CLASS_PARASOL_LADY
.charmapstr "ELEANOR$", 8 .charmapstr "ELEANOR$", 8
; pre-battle speech @ pre-battle speech
ec_word I ec_word I
ec_word REALLY ec_word REALLY
ec_word WANT ec_word WANT
ec_word TO ec_word TO
ec_word PARTY ec_word PARTY
.2byte -1 .2byte -1
; win speech @ win speech
ec_word A ec_word A
ec_word TRENDY ec_word TRENDY
ec_word PARTY ec_word PARTY
ec_word WOULD ec_word WOULD
ec_word BE ec_word BE
ec_word REFRESHING ec_word REFRESHING
; loss speech @ loss speech
ec_word DON_T ec_word DON_T
ec_word YOU ec_word YOU
ec_word LIKE ec_word LIKE
@@ -651,24 +651,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word QUES ec_word QUES
.4byte gFallarborBattleTentTrainerMons_Eleanor .4byte gFallarborBattleTentTrainerMons_Eleanor
; 25 @ 25
.4byte TRAINER_CLASS_SWIMMER_F .4byte TRAINER_CLASS_SWIMMER_F
.charmapstr "EVELYN$", 8 .charmapstr "EVELYN$", 8
; pre-battle speech @ pre-battle speech
ec_word MY ec_word MY
ec_word PC ec_word PC
ec_word IS ec_word IS
ec_word MY ec_word MY
ec_word SECRET_BASE ec_word SECRET_BASE
ec_word EXCL ec_word EXCL
; win speech @ win speech
ec_word IT_S ec_word IT_S
ec_word ALL ec_word ALL
ec_word SECRET ec_word SECRET
ec_word ON ec_word ON
ec_word MY ec_word MY
ec_word PC ec_word PC
; loss speech @ loss speech
ec_word NO ec_word NO
ec_word EXCL ec_word EXCL
.2byte -1 .2byte -1
@@ -677,24 +677,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word THIS ec_word THIS
.4byte gFallarborBattleTentTrainerMons_Evelyn .4byte gFallarborBattleTentTrainerMons_Evelyn
; 26 @ 26
.4byte TRAINER_CLASS_PICNICKER .4byte TRAINER_CLASS_PICNICKER
.charmapstr "ARIELLE$", 8 .charmapstr "ARIELLE$", 8
; pre-battle speech @ pre-battle speech
ec_word IT_S ec_word IT_S
ec_word NOT_VERY ec_word NOT_VERY
ec_word PRETTY ec_word PRETTY
ec_word BUT ec_word BUT
ec_word I ec_word I
ec_word TRY ec_word TRY
; win speech @ win speech
ec_word WE_RE ec_word WE_RE
ec_word NOT_VERY ec_word NOT_VERY
ec_word PRETTY ec_word PRETTY
ec_word BUT ec_word BUT
ec_word WE_RE ec_word WE_RE
ec_word GREAT ec_word GREAT
; loss speech @ loss speech
ec_word THAT_WAS ec_word THAT_WAS
ec_word PRETTY ec_word PRETTY
ec_word MEAN ec_word MEAN
@@ -703,24 +703,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word EXCL ec_word EXCL
.4byte gFallarborBattleTentTrainerMons_Arielle .4byte gFallarborBattleTentTrainerMons_Arielle
; 27 @ 27
.4byte TRAINER_CLASS_SAILOR .4byte TRAINER_CLASS_SAILOR
.charmapstr "CONNAR$", 8 .charmapstr "CONNAR$", 8
; pre-battle speech @ pre-battle speech
ec_word I_AM ec_word I_AM
ec_word NOT ec_word NOT
ec_word STRONG ec_word STRONG
ec_word ENOUGH ec_word ENOUGH
ec_word FOR ec_word FOR
ec_word THIS ec_word THIS
; win speech @ win speech
ec_word DO ec_word DO
ec_word YOU ec_word YOU
ec_word THINK ec_word THINK
ec_word YOU_RE ec_word YOU_RE
ec_word OK_QUES ec_word OK_QUES
.2byte -1 .2byte -1
; loss speech @ loss speech
ec_word GOOD_BYE ec_word GOOD_BYE
ec_word AND ec_word AND
ec_word THANK_YOU ec_word THANK_YOU
@@ -729,24 +729,24 @@ gFallarborBattleTentTrainers: ; 85DF084
.2byte -1 .2byte -1
.4byte gFallarborBattleTentTrainerMons_Connar .4byte gFallarborBattleTentTrainerMons_Connar
; 28 @ 28
.4byte TRAINER_CLASS_COLLECTOR .4byte TRAINER_CLASS_COLLECTOR
.charmapstr "MAURICE$", 8 .charmapstr "MAURICE$", 8
; pre-battle speech @ pre-battle speech
ec_word THERE ec_word THERE
ec_word IS ec_word IS
ec_word NO ec_word NO
ec_word RADIO ec_word RADIO
ec_word OR ec_word OR
ec_word TELEVISION ec_word TELEVISION
; win speech @ win speech
ec_word BUT ec_word BUT
ec_word THERE ec_word THERE
ec_word IS ec_word IS
ec_word A_LOT ec_word A_LOT
ec_word OF ec_word OF
ec_word POKEMON ec_word POKEMON
; loss speech @ loss speech
ec_word I ec_word I
ec_word CAN_T ec_word CAN_T
ec_word ENJOY ec_word ENJOY
@@ -755,24 +755,24 @@ gFallarborBattleTentTrainers: ; 85DF084
ec_word MONEY ec_word MONEY
.4byte gFallarborBattleTentTrainerMons_Maurice .4byte gFallarborBattleTentTrainerMons_Maurice
; 29 @ 29
.4byte TRAINER_CLASS_LASS .4byte TRAINER_CLASS_LASS
.charmapstr "KIANNA$", 8 .charmapstr "KIANNA$", 8
; pre-battle speech @ pre-battle speech
ec_word I ec_word I
ec_word WANT ec_word WANT
ec_word TO ec_word TO
ec_word GO ec_word GO
ec_word DEPT_STORE ec_word DEPT_STORE
ec_word SHOPPING ec_word SHOPPING
; win speech @ win speech
ec_word I ec_word I
ec_word DISLIKE ec_word DISLIKE
ec_word SHOPPING ec_word SHOPPING
ec_word ALONE ec_word ALONE
.2byte -1 .2byte -1
.2byte -1 .2byte -1
; loss speech @ loss speech
ec_word WANT ec_word WANT
ec_word TO ec_word TO
ec_word GO ec_word GO
data/battle_frontier/slateport_battle_tent_mons.s
+71 -71
View File
@@ -1,490 +1,490 @@
.align 2, 0 .align 2, 0
gSlateportBattleTentMons: ; 85DE02C gSlateportBattleTentMons: @ 85DE02C
; 0 @ 0
.2byte SPECIES_ZIGZAGOON .2byte SPECIES_ZIGZAGOON
.2byte MOVE_TACKLE, MOVE_CHARM, MOVE_ODOR_SLEUTH, MOVE_PIN_MISSILE .2byte MOVE_TACKLE, MOVE_CHARM, MOVE_ODOR_SLEUTH, MOVE_PIN_MISSILE
.byte BATTLE_FRONTIER_ITEM_CHOICE_BAND .byte BATTLE_FRONTIER_ITEM_CHOICE_BAND
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
.4byte NATURE_JOLLY .4byte NATURE_JOLLY
; 1 @ 1
.2byte SPECIES_ZIGZAGOON .2byte SPECIES_ZIGZAGOON
.2byte MOVE_DIG, MOVE_MUD_SPORT, MOVE_TAIL_WHIP, MOVE_REST .2byte MOVE_DIG, MOVE_MUD_SPORT, MOVE_TAIL_WHIP, MOVE_REST
.byte BATTLE_FRONTIER_ITEM_LUM_BERRY .byte BATTLE_FRONTIER_ITEM_LUM_BERRY
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
.4byte NATURE_JOLLY .4byte NATURE_JOLLY
; 2 @ 2
.2byte SPECIES_BEAUTIFLY .2byte SPECIES_BEAUTIFLY
.2byte MOVE_STUN_SPORE, MOVE_MEGA_DRAIN, MOVE_GUST, MOVE_HARDEN .2byte MOVE_STUN_SPORE, MOVE_MEGA_DRAIN, MOVE_GUST, MOVE_HARDEN
.byte BATTLE_FRONTIER_ITEM_NONE .byte BATTLE_FRONTIER_ITEM_NONE
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
.4byte NATURE_MODEST .4byte NATURE_MODEST
; 3 @ 3
.2byte SPECIES_DUSTOX .2byte SPECIES_DUSTOX
.2byte MOVE_POISON_STING, MOVE_MOONLIGHT, MOVE_PROTECT, MOVE_GUST .2byte MOVE_POISON_STING, MOVE_MOONLIGHT, MOVE_PROTECT, MOVE_GUST
.byte BATTLE_FRONTIER_ITEM_ORAN_BERRY .byte BATTLE_FRONTIER_ITEM_ORAN_BERRY
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
.4byte NATURE_MODEST .4byte NATURE_MODEST
; 4 @ 4
.2byte SPECIES_WAILMER .2byte SPECIES_WAILMER
.2byte MOVE_ROLLOUT, MOVE_CURSE, MOVE_GROWL, MOVE_WHIRLPOOL .2byte MOVE_ROLLOUT, MOVE_CURSE, MOVE_GROWL, MOVE_WHIRLPOOL
.byte BATTLE_FRONTIER_ITEM_RAWST_BERRY .byte BATTLE_FRONTIER_ITEM_RAWST_BERRY
.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 5 @ 5
.2byte SPECIES_WAILMER .2byte SPECIES_WAILMER
.2byte MOVE_ROLLOUT, MOVE_GROWL, MOVE_WHIRLPOOL, MOVE_WATER_PULSE .2byte MOVE_ROLLOUT, MOVE_GROWL, MOVE_WHIRLPOOL, MOVE_WATER_PULSE
.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
.4byte NATURE_MODEST .4byte NATURE_MODEST
; 6 @ 6
.2byte SPECIES_MARILL .2byte SPECIES_MARILL
.2byte MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_TAIL_WHIP, MOVE_BUBBLE_BEAM .2byte MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_TAIL_WHIP, MOVE_BUBBLE_BEAM
.byte BATTLE_FRONTIER_ITEM_WHITE_HERB .byte BATTLE_FRONTIER_ITEM_WHITE_HERB
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
.4byte NATURE_IMPISH .4byte NATURE_IMPISH
; 7 @ 7
.2byte SPECIES_WINGULL .2byte SPECIES_WINGULL
.2byte MOVE_SUPERSONIC, MOVE_GROWL, MOVE_WING_ATTACK, MOVE_STEEL_WING .2byte MOVE_SUPERSONIC, MOVE_GROWL, MOVE_WING_ATTACK, MOVE_STEEL_WING
.byte BATTLE_FRONTIER_ITEM_METAL_COAT .byte BATTLE_FRONTIER_ITEM_METAL_COAT
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
.4byte NATURE_NAIVE .4byte NATURE_NAIVE
; 8 @ 8
.2byte SPECIES_PELIPPER .2byte SPECIES_PELIPPER
.2byte MOVE_TWISTER, MOVE_WATER_SPORT, MOVE_GROWL, MOVE_WING_ATTACK .2byte MOVE_TWISTER, MOVE_WATER_SPORT, MOVE_GROWL, MOVE_WING_ATTACK
.byte BATTLE_FRONTIER_ITEM_DRAGON_FANG .byte BATTLE_FRONTIER_ITEM_DRAGON_FANG
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
.4byte NATURE_MODEST .4byte NATURE_MODEST
; 9 @ 9
.2byte SPECIES_CACNEA .2byte SPECIES_CACNEA
.2byte MOVE_SANDSTORM, MOVE_LEER, MOVE_LEECH_SEED, MOVE_PIN_MISSILE .2byte MOVE_SANDSTORM, MOVE_LEER, MOVE_LEECH_SEED, MOVE_PIN_MISSILE
.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
.byte F_EV_SPREAD_SPEED .byte F_EV_SPREAD_SPEED
.4byte NATURE_JOLLY .4byte NATURE_JOLLY
; 10 @ 10
.2byte SPECIES_LOMBRE .2byte SPECIES_LOMBRE
.2byte MOVE_ASTONISH, MOVE_WATER_GUN, MOVE_FAKE_OUT, MOVE_ABSORB .2byte MOVE_ASTONISH, MOVE_WATER_GUN, MOVE_FAKE_OUT, MOVE_ABSORB
.byte BATTLE_FRONTIER_ITEM_MIRACLE_SEED .byte BATTLE_FRONTIER_ITEM_MIRACLE_SEED
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_MODEST .4byte NATURE_MODEST
; 11 @ 11
.2byte SPECIES_LOTAD .2byte SPECIES_LOTAD
.2byte MOVE_SYNTHESIS, MOVE_NATURE_POWER, MOVE_RAIN_DANCE, MOVE_MEGA_DRAIN .2byte MOVE_SYNTHESIS, MOVE_NATURE_POWER, MOVE_RAIN_DANCE, MOVE_MEGA_DRAIN
.byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER .byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
.4byte NATURE_DOCILE .4byte NATURE_DOCILE
; 12 @ 12
.2byte SPECIES_SEEDOT .2byte SPECIES_SEEDOT
.2byte MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_LEECH_SEED, MOVE_BIDE .2byte MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_LEECH_SEED, MOVE_BIDE
.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
.4byte NATURE_TIMID .4byte NATURE_TIMID
; 13 @ 13
.2byte SPECIES_NUZLEAF .2byte SPECIES_NUZLEAF
.2byte MOVE_FAKE_OUT, MOVE_NATURE_POWER, MOVE_HARDEN, MOVE_ATTRACT .2byte MOVE_FAKE_OUT, MOVE_NATURE_POWER, MOVE_HARDEN, MOVE_ATTRACT
.byte BATTLE_FRONTIER_ITEM_NONE .byte BATTLE_FRONTIER_ITEM_NONE
.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_LONELY .4byte NATURE_LONELY
; 14 @ 14
.2byte SPECIES_NINJASK .2byte SPECIES_NINJASK
.2byte MOVE_FURY_CUTTER, MOVE_SCREECH, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM .2byte MOVE_FURY_CUTTER, MOVE_SCREECH, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM
.byte BATTLE_FRONTIER_ITEM_NONE .byte BATTLE_FRONTIER_ITEM_NONE
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
.4byte NATURE_QUIRKY .4byte NATURE_QUIRKY
; 15 @ 15
.2byte SPECIES_NINJASK .2byte SPECIES_NINJASK
.2byte MOVE_FURY_CUTTER, MOVE_DOUBLE_TEAM, MOVE_SCREECH, MOVE_SAND_ATTACK .2byte MOVE_FURY_CUTTER, MOVE_DOUBLE_TEAM, MOVE_SCREECH, MOVE_SAND_ATTACK
.byte BATTLE_FRONTIER_ITEM_SILVER_POWDER .byte BATTLE_FRONTIER_ITEM_SILVER_POWDER
.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
.4byte NATURE_NAUGHTY .4byte NATURE_NAUGHTY
; 16 @ 16
.2byte SPECIES_GRAVELER .2byte SPECIES_GRAVELER
.2byte MOVE_MUD_SPORT, MOVE_BLOCK, MOVE_ROCK_TOMB, MOVE_MAGNITUDE .2byte MOVE_MUD_SPORT, MOVE_BLOCK, MOVE_ROCK_TOMB, MOVE_MAGNITUDE
.byte BATTLE_FRONTIER_ITEM_NONE .byte BATTLE_FRONTIER_ITEM_NONE
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_BRAVE .4byte NATURE_BRAVE
; 17 @ 17
.2byte SPECIES_BALTOY .2byte SPECIES_BALTOY
.2byte MOVE_SELF_DESTRUCT, MOVE_ANCIENT_POWER, MOVE_PSYBEAM, MOVE_REFLECT .2byte MOVE_SELF_DESTRUCT, MOVE_ANCIENT_POWER, MOVE_PSYBEAM, MOVE_REFLECT
.byte BATTLE_FRONTIER_ITEM_NONE .byte BATTLE_FRONTIER_ITEM_NONE
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
.4byte NATURE_NAIVE .4byte NATURE_NAIVE
; 18 @ 18
.2byte SPECIES_MIGHTYENA .2byte SPECIES_MIGHTYENA
.2byte MOVE_BITE, MOVE_ROAR, MOVE_SWAGGER, MOVE_TACKLE .2byte MOVE_BITE, MOVE_ROAR, MOVE_SWAGGER, MOVE_TACKLE
.byte BATTLE_FRONTIER_ITEM_BLACK_GLASSES .byte BATTLE_FRONTIER_ITEM_BLACK_GLASSES
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
.4byte NATURE_CALM .4byte NATURE_CALM
; 19 @ 19
.2byte SPECIES_MIGHTYENA .2byte SPECIES_MIGHTYENA
.2byte MOVE_ODOR_SLEUTH, MOVE_HOWL, MOVE_SAND_ATTACK, MOVE_POISON_FANG .2byte MOVE_ODOR_SLEUTH, MOVE_HOWL, MOVE_SAND_ATTACK, MOVE_POISON_FANG
.byte BATTLE_FRONTIER_ITEM_SHELL_BELL .byte BATTLE_FRONTIER_ITEM_SHELL_BELL
.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_LONELY .4byte NATURE_LONELY
; 20 @ 20
.2byte SPECIES_LINOONE .2byte SPECIES_LINOONE
.2byte MOVE_HEADBUTT, MOVE_TICKLE, MOVE_TAIL_WHIP, MOVE_REST .2byte MOVE_HEADBUTT, MOVE_TICKLE, MOVE_TAIL_WHIP, MOVE_REST
.byte BATTLE_FRONTIER_ITEM_MENTAL_HERB .byte BATTLE_FRONTIER_ITEM_MENTAL_HERB
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_JOLLY .4byte NATURE_JOLLY
; 21 @ 21
.2byte SPECIES_GOLDEEN .2byte SPECIES_GOLDEEN
.2byte MOVE_WATER_SPORT, MOVE_HORN_ATTACK, MOVE_WATERFALL, MOVE_SUPERSONIC .2byte MOVE_WATER_SPORT, MOVE_HORN_ATTACK, MOVE_WATERFALL, MOVE_SUPERSONIC
.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
.4byte NATURE_CALM .4byte NATURE_CALM
; 22 @ 22
.2byte SPECIES_ELECTRIKE .2byte SPECIES_ELECTRIKE
.2byte MOVE_BITE, MOVE_SPARK, MOVE_ROAR, MOVE_FLASH .2byte MOVE_BITE, MOVE_SPARK, MOVE_ROAR, MOVE_FLASH
.byte BATTLE_FRONTIER_ITEM_MAGNET .byte BATTLE_FRONTIER_ITEM_MAGNET
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
.4byte NATURE_MODEST .4byte NATURE_MODEST
; 23 @ 23
.2byte SPECIES_VOLTORB .2byte SPECIES_VOLTORB
.2byte MOVE_SPARK, MOVE_ROLLOUT, MOVE_CHARGE, MOVE_SCREECH .2byte MOVE_SPARK, MOVE_ROLLOUT, MOVE_CHARGE, MOVE_SCREECH
.byte BATTLE_FRONTIER_ITEM_NONE .byte BATTLE_FRONTIER_ITEM_NONE
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK
.4byte NATURE_MILD .4byte NATURE_MILD
; 24 @ 24
.2byte SPECIES_ARON .2byte SPECIES_ARON
.2byte MOVE_DIG, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_ENDEAVOR .2byte MOVE_DIG, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_ENDEAVOR
.byte BATTLE_FRONTIER_ITEM_NONE .byte BATTLE_FRONTIER_ITEM_NONE
.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_NAUGHTY .4byte NATURE_NAUGHTY
; 25 @ 25
.2byte SPECIES_ARON .2byte SPECIES_ARON
.2byte MOVE_MUD_SLAP, MOVE_IRON_TAIL, MOVE_HARDEN, MOVE_ROAR .2byte MOVE_MUD_SLAP, MOVE_IRON_TAIL, MOVE_HARDEN, MOVE_ROAR
.byte BATTLE_FRONTIER_ITEM_LEPPA_BERRY .byte BATTLE_FRONTIER_ITEM_LEPPA_BERRY
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_MODEST .4byte NATURE_MODEST
; 26 @ 26
.2byte SPECIES_TRAPINCH .2byte SPECIES_TRAPINCH
.2byte MOVE_BODY_SLAM, MOVE_FOCUS_ENERGY, MOVE_SAND_TOMB, MOVE_SAND_ATTACK .2byte MOVE_BODY_SLAM, MOVE_FOCUS_ENERGY, MOVE_SAND_TOMB, MOVE_SAND_ATTACK
.byte BATTLE_FRONTIER_ITEM_NONE .byte BATTLE_FRONTIER_ITEM_NONE
.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_BRAVE .4byte NATURE_BRAVE
; 27 @ 27
.2byte SPECIES_CACNEA .2byte SPECIES_CACNEA
.2byte MOVE_INGRAIN, MOVE_SANDSTORM, MOVE_POISON_STING, MOVE_DESTINY_BOND .2byte MOVE_INGRAIN, MOVE_SANDSTORM, MOVE_POISON_STING, MOVE_DESTINY_BOND
.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
.4byte NATURE_TIMID .4byte NATURE_TIMID
; 28 @ 28
.2byte SPECIES_TAILLOW .2byte SPECIES_TAILLOW
.2byte MOVE_GROWL, MOVE_AERIAL_ACE, MOVE_AGILITY, MOVE_ENDEAVOR .2byte MOVE_GROWL, MOVE_AERIAL_ACE, MOVE_AGILITY, MOVE_ENDEAVOR
.byte BATTLE_FRONTIER_ITEM_SHARP_BEAK .byte BATTLE_FRONTIER_ITEM_SHARP_BEAK
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 29 @ 29
.2byte SPECIES_SWELLOW .2byte SPECIES_SWELLOW
.2byte MOVE_SUPERSONIC, MOVE_GROWL, MOVE_FOCUS_ENERGY, MOVE_PECK .2byte MOVE_SUPERSONIC, MOVE_GROWL, MOVE_FOCUS_ENERGY, MOVE_PECK
.byte BATTLE_FRONTIER_ITEM_NONE .byte BATTLE_FRONTIER_ITEM_NONE
.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_IMPISH .4byte NATURE_IMPISH
; 30 @ 30
.2byte SPECIES_GOLBAT .2byte SPECIES_GOLBAT
.2byte MOVE_ASTONISH, MOVE_GUST, MOVE_MEAN_LOOK, MOVE_CONFUSE_RAY .2byte MOVE_ASTONISH, MOVE_GUST, MOVE_MEAN_LOOK, MOVE_CONFUSE_RAY
.byte BATTLE_FRONTIER_ITEM_SPELL_TAG .byte BATTLE_FRONTIER_ITEM_SPELL_TAG
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE
.4byte NATURE_TIMID .4byte NATURE_TIMID
; 31 @ 31
.2byte SPECIES_LOUDRED .2byte SPECIES_LOUDRED
.2byte MOVE_ASTONISH, MOVE_SCREECH, MOVE_UPROAR, MOVE_SUPERSONIC .2byte MOVE_ASTONISH, MOVE_SCREECH, MOVE_UPROAR, MOVE_SUPERSONIC
.byte BATTLE_FRONTIER_ITEM_NONE .byte BATTLE_FRONTIER_ITEM_NONE
.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 32 @ 32
.2byte SPECIES_SPINDA .2byte SPECIES_SPINDA
.2byte MOVE_DIZZY_PUNCH, MOVE_FAINT_ATTACK, MOVE_HYPNOSIS, MOVE_REST .2byte MOVE_DIZZY_PUNCH, MOVE_FAINT_ATTACK, MOVE_HYPNOSIS, MOVE_REST
.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 33 @ 33
.2byte SPECIES_MAGNEMITE .2byte SPECIES_MAGNEMITE
.2byte MOVE_METAL_SOUND, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SPARK .2byte MOVE_METAL_SOUND, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SPARK
.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
.4byte NATURE_SERIOUS .4byte NATURE_SERIOUS
; 34 @ 34
.2byte SPECIES_WHISMUR .2byte SPECIES_WHISMUR
.2byte MOVE_REST, MOVE_SLEEP_TALK, MOVE_HOWL, MOVE_BODY_SLAM .2byte MOVE_REST, MOVE_SLEEP_TALK, MOVE_HOWL, MOVE_BODY_SLAM
.byte BATTLE_FRONTIER_ITEM_SILK_SCARF .byte BATTLE_FRONTIER_ITEM_SILK_SCARF
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 35 @ 35
.2byte SPECIES_MAKUHITA .2byte SPECIES_MAKUHITA
.2byte MOVE_SAND_ATTACK, MOVE_KNOCK_OFF, MOVE_ARM_THRUST, MOVE_BELLY_DRUM .2byte MOVE_SAND_ATTACK, MOVE_KNOCK_OFF, MOVE_ARM_THRUST, MOVE_BELLY_DRUM
.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 36 @ 36
.2byte SPECIES_NUMEL .2byte SPECIES_NUMEL
.2byte MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_GROWL, MOVE_FOCUS_ENERGY .2byte MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_GROWL, MOVE_FOCUS_ENERGY
.byte BATTLE_FRONTIER_ITEM_NONE .byte BATTLE_FRONTIER_ITEM_NONE
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
.4byte NATURE_MODEST .4byte NATURE_MODEST
; 37 @ 37
.2byte SPECIES_BARBOACH .2byte SPECIES_BARBOACH
.2byte MOVE_MAGNITUDE, MOVE_MUD_SPORT, MOVE_WATER_SPORT, MOVE_WATER_GUN .2byte MOVE_MAGNITUDE, MOVE_MUD_SPORT, MOVE_WATER_SPORT, MOVE_WATER_GUN
.byte BATTLE_FRONTIER_ITEM_SEA_INCENSE .byte BATTLE_FRONTIER_ITEM_SEA_INCENSE
.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_JOLLY .4byte NATURE_JOLLY
; 38 @ 38
.2byte SPECIES_TENTACOOL .2byte SPECIES_TENTACOOL
.2byte MOVE_SCREECH, MOVE_BUBBLE_BEAM, MOVE_ACID, MOVE_BARRIER .2byte MOVE_SCREECH, MOVE_BUBBLE_BEAM, MOVE_ACID, MOVE_BARRIER
.byte BATTLE_FRONTIER_ITEM_POISON_BARB .byte BATTLE_FRONTIER_ITEM_POISON_BARB
.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 39 @ 39
.2byte SPECIES_VIGOROTH .2byte SPECIES_VIGOROTH
.2byte MOVE_FOCUS_ENERGY, MOVE_FURY_SWIPES, MOVE_ENDURE, MOVE_YAWN .2byte MOVE_FOCUS_ENERGY, MOVE_FURY_SWIPES, MOVE_ENDURE, MOVE_YAWN
.byte BATTLE_FRONTIER_ITEM_AGUAV_BERRY .byte BATTLE_FRONTIER_ITEM_AGUAV_BERRY
.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 40 @ 40
.2byte SPECIES_MAGIKARP .2byte SPECIES_MAGIKARP
.2byte MOVE_TACKLE, MOVE_FLAIL, MOVE_SPLASH, MOVE_NONE .2byte MOVE_TACKLE, MOVE_FLAIL, MOVE_SPLASH, MOVE_NONE
.byte BATTLE_FRONTIER_ITEM_DRAGON_SCALE .byte BATTLE_FRONTIER_ITEM_DRAGON_SCALE
.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 41 @ 41
.2byte SPECIES_SEVIPER .2byte SPECIES_SEVIPER
.2byte MOVE_LICK, MOVE_POISON_FANG, MOVE_GLARE, MOVE_WRAP .2byte MOVE_LICK, MOVE_POISON_FANG, MOVE_GLARE, MOVE_WRAP
.byte BATTLE_FRONTIER_ITEM_NONE .byte BATTLE_FRONTIER_ITEM_NONE
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 42 @ 42
.2byte SPECIES_SOLROCK .2byte SPECIES_SOLROCK
.2byte MOVE_ROCK_THROW, MOVE_HARDEN, MOVE_PSYWAVE, MOVE_TACKLE .2byte MOVE_ROCK_THROW, MOVE_HARDEN, MOVE_PSYWAVE, MOVE_TACKLE
.byte BATTLE_FRONTIER_ITEM_HARD_STONE .byte BATTLE_FRONTIER_ITEM_HARD_STONE
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 43 @ 43
.2byte SPECIES_KECLEON .2byte SPECIES_KECLEON
.2byte MOVE_PSYBEAM, MOVE_SUBSTITUTE, MOVE_THIEF, MOVE_TAIL_WHIP .2byte MOVE_PSYBEAM, MOVE_SUBSTITUTE, MOVE_THIEF, MOVE_TAIL_WHIP
.byte BATTLE_FRONTIER_ITEM_NONE .byte BATTLE_FRONTIER_ITEM_NONE
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
.4byte NATURE_MODEST .4byte NATURE_MODEST
; 44 @ 44
.2byte SPECIES_KECLEON .2byte SPECIES_KECLEON
.2byte MOVE_FAINT_ATTACK, MOVE_ASTONISH, MOVE_LICK, MOVE_SCREECH .2byte MOVE_FAINT_ATTACK, MOVE_ASTONISH, MOVE_LICK, MOVE_SCREECH
.byte BATTLE_FRONTIER_ITEM_IAPAPA_BERRY .byte BATTLE_FRONTIER_ITEM_IAPAPA_BERRY
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
.4byte NATURE_CALM .4byte NATURE_CALM
; 45 @ 45
.2byte SPECIES_SHROOMISH .2byte SPECIES_SHROOMISH
.2byte MOVE_STUN_SPORE, MOVE_TACKLE, MOVE_LEECH_SEED, MOVE_MEGA_DRAIN .2byte MOVE_STUN_SPORE, MOVE_TACKLE, MOVE_LEECH_SEED, MOVE_MEGA_DRAIN
.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
.4byte NATURE_MODEST .4byte NATURE_MODEST
; 46 @ 46
.2byte SPECIES_SHROOMISH .2byte SPECIES_SHROOMISH
.2byte MOVE_ABSORB, MOVE_STUN_SPORE, MOVE_SPORE, MOVE_LEECH_SEED .2byte MOVE_ABSORB, MOVE_STUN_SPORE, MOVE_SPORE, MOVE_LEECH_SEED
.byte BATTLE_FRONTIER_ITEM_FIGY_BERRY .byte BATTLE_FRONTIER_ITEM_FIGY_BERRY
.byte F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_ATTACK
.4byte NATURE_BRAVE .4byte NATURE_BRAVE
; 47 @ 47
.2byte SPECIES_LOMBRE .2byte SPECIES_LOMBRE
.2byte MOVE_NATURE_POWER, MOVE_ASTONISH, MOVE_GROWL, MOVE_ABSORB .2byte MOVE_NATURE_POWER, MOVE_ASTONISH, MOVE_GROWL, MOVE_ABSORB
.byte BATTLE_FRONTIER_ITEM_NONE .byte BATTLE_FRONTIER_ITEM_NONE
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
.4byte NATURE_LONELY .4byte NATURE_LONELY
; 48 @ 48
.2byte SPECIES_NUMEL .2byte SPECIES_NUMEL
.2byte MOVE_EMBER, MOVE_GROWL, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY .2byte MOVE_EMBER, MOVE_GROWL, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY
.byte BATTLE_FRONTIER_ITEM_CHARCOAL .byte BATTLE_FRONTIER_ITEM_CHARCOAL
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
.4byte NATURE_MODEST .4byte NATURE_MODEST
; 49 @ 49
.2byte SPECIES_TRAPINCH .2byte SPECIES_TRAPINCH
.2byte MOVE_FAINT_ATTACK, MOVE_DIG, MOVE_BITE, MOVE_QUICK_ATTACK .2byte MOVE_FAINT_ATTACK, MOVE_DIG, MOVE_BITE, MOVE_QUICK_ATTACK
.byte BATTLE_FRONTIER_ITEM_ASPEAR_BERRY .byte BATTLE_FRONTIER_ITEM_ASPEAR_BERRY
.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_BRAVE .4byte NATURE_BRAVE
; 50 @ 50
.2byte SPECIES_PELIPPER .2byte SPECIES_PELIPPER
.2byte MOVE_WING_ATTACK, MOVE_SUPERSONIC, MOVE_MIST, MOVE_AGILITY .2byte MOVE_WING_ATTACK, MOVE_SUPERSONIC, MOVE_MIST, MOVE_AGILITY
.byte BATTLE_FRONTIER_ITEM_WIKI_BERRY .byte BATTLE_FRONTIER_ITEM_WIKI_BERRY
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 51 @ 51
.2byte SPECIES_WINGULL .2byte SPECIES_WINGULL
.2byte MOVE_WATER_GUN, MOVE_SUPERSONIC, MOVE_GROWL, MOVE_ICY_WIND .2byte MOVE_WATER_GUN, MOVE_SUPERSONIC, MOVE_GROWL, MOVE_ICY_WIND
.byte BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE .byte BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 52 @ 52
.2byte SPECIES_MARILL .2byte SPECIES_MARILL
.2byte MOVE_DOUBLE_EDGE, MOVE_RAIN_DANCE, MOVE_TAIL_WHIP, MOVE_WATER_GUN .2byte MOVE_DOUBLE_EDGE, MOVE_RAIN_DANCE, MOVE_TAIL_WHIP, MOVE_WATER_GUN
.byte BATTLE_FRONTIER_ITEM_GANLON_BERRY .byte BATTLE_FRONTIER_ITEM_GANLON_BERRY
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_MODEST .4byte NATURE_MODEST
; 53 @ 53
.2byte SPECIES_SKITTY .2byte SPECIES_SKITTY
.2byte MOVE_ASSIST, MOVE_ATTRACT, MOVE_SING, MOVE_CHARM .2byte MOVE_ASSIST, MOVE_ATTRACT, MOVE_SING, MOVE_CHARM
.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_CAREFUL .4byte NATURE_CAREFUL
; 54 @ 54
.2byte SPECIES_SEVIPER .2byte SPECIES_SEVIPER
.2byte MOVE_SWAGGER, MOVE_WRAP, MOVE_POISON_TAIL, MOVE_HAZE .2byte MOVE_SWAGGER, MOVE_WRAP, MOVE_POISON_TAIL, MOVE_HAZE
.byte BATTLE_FRONTIER_ITEM_NONE .byte BATTLE_FRONTIER_ITEM_NONE
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
.4byte NATURE_BRAVE .4byte NATURE_BRAVE
; 55 @ 55
.2byte SPECIES_GOLBAT .2byte SPECIES_GOLBAT
.2byte MOVE_BITE, MOVE_TORMENT, MOVE_SCREECH, MOVE_POISON_FANG .2byte MOVE_BITE, MOVE_TORMENT, MOVE_SCREECH, MOVE_POISON_FANG
.byte BATTLE_FRONTIER_ITEM_LEFTOVERS .byte BATTLE_FRONTIER_ITEM_LEFTOVERS
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
.4byte NATURE_HARDY .4byte NATURE_HARDY
; 56 @ 56
.2byte SPECIES_RALTS .2byte SPECIES_RALTS
.2byte MOVE_HYPNOSIS, MOVE_IMPRISON, MOVE_PSYCHIC, MOVE_DREAM_EATER .2byte MOVE_HYPNOSIS, MOVE_IMPRISON, MOVE_PSYCHIC, MOVE_DREAM_EATER
.byte BATTLE_FRONTIER_ITEM_MAGO_BERRY .byte BATTLE_FRONTIER_ITEM_MAGO_BERRY
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
.4byte NATURE_TIMID .4byte NATURE_TIMID
; 57 @ 57
.2byte SPECIES_SANDSHREW .2byte SPECIES_SANDSHREW
.2byte MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_SAND_TOMB, MOVE_DEFENSE_CURL .2byte MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_SAND_TOMB, MOVE_DEFENSE_CURL
.byte BATTLE_FRONTIER_ITEM_SOFT_SAND .byte BATTLE_FRONTIER_ITEM_SOFT_SAND
.byte 0 .byte 0
.4byte NATURE_HARDY .4byte NATURE_HARDY
; 58 @ 58
.2byte SPECIES_SWALOT .2byte SPECIES_SWALOT
.2byte MOVE_YAWN, MOVE_SLUDGE, MOVE_ENCORE, MOVE_POUND .2byte MOVE_YAWN, MOVE_SLUDGE, MOVE_ENCORE, MOVE_POUND
.byte BATTLE_FRONTIER_ITEM_NONE .byte BATTLE_FRONTIER_ITEM_NONE
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
.4byte NATURE_IMPISH .4byte NATURE_IMPISH
; 59 @ 59
.2byte SPECIES_VOLBEAT .2byte SPECIES_VOLBEAT
.2byte MOVE_TACKLE, MOVE_CONFUSE_RAY, MOVE_QUICK_ATTACK, MOVE_DOUBLE_TEAM .2byte MOVE_TACKLE, MOVE_CONFUSE_RAY, MOVE_QUICK_ATTACK, MOVE_DOUBLE_TEAM
.byte BATTLE_FRONTIER_ITEM_NONE .byte BATTLE_FRONTIER_ITEM_NONE
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
.4byte NATURE_HARDY .4byte NATURE_HARDY
; 60 @ 60
.2byte SPECIES_ILLUMISE .2byte SPECIES_ILLUMISE
.2byte MOVE_CHARM, MOVE_TACKLE, MOVE_ENCORE, MOVE_MOONLIGHT .2byte MOVE_CHARM, MOVE_TACKLE, MOVE_ENCORE, MOVE_MOONLIGHT
.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY .byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 61 @ 61
.2byte SPECIES_KADABRA .2byte SPECIES_KADABRA
.2byte MOVE_DISABLE, MOVE_CONFUSION, MOVE_REFLECT, MOVE_RECOVER .2byte MOVE_DISABLE, MOVE_CONFUSION, MOVE_REFLECT, MOVE_RECOVER
.byte BATTLE_FRONTIER_ITEM_NONE .byte BATTLE_FRONTIER_ITEM_NONE
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
.4byte NATURE_QUIRKY .4byte NATURE_QUIRKY
; 62 @ 62
.2byte SPECIES_KIRLIA .2byte SPECIES_KIRLIA
.2byte MOVE_CALM_MIND, MOVE_CONFUSION, MOVE_DOUBLE_TEAM, MOVE_GROWL .2byte MOVE_CALM_MIND, MOVE_CONFUSION, MOVE_DOUBLE_TEAM, MOVE_GROWL
.byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON .byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_CAREFUL .4byte NATURE_CAREFUL
; 63 @ 63
.2byte SPECIES_BRELOOM .2byte SPECIES_BRELOOM
.2byte MOVE_ABSORB, MOVE_TACKLE, MOVE_STUN_SPORE, MOVE_MEGA_DRAIN .2byte MOVE_ABSORB, MOVE_TACKLE, MOVE_STUN_SPORE, MOVE_MEGA_DRAIN
.byte BATTLE_FRONTIER_ITEM_NONE .byte BATTLE_FRONTIER_ITEM_NONE
.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_NAIVE .4byte NATURE_NAIVE
; 64 @ 64
.2byte SPECIES_PLUSLE .2byte SPECIES_PLUSLE
.2byte MOVE_SPARK, MOVE_ENCORE, MOVE_THUNDER_WAVE, MOVE_GROWL .2byte MOVE_SPARK, MOVE_ENCORE, MOVE_THUNDER_WAVE, MOVE_GROWL
.byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY .byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
.4byte NATURE_LONELY .4byte NATURE_LONELY
; 65 @ 65
.2byte SPECIES_PLUSLE .2byte SPECIES_PLUSLE
.2byte MOVE_SPARK, MOVE_FAKE_TEARS, MOVE_SUBSTITUTE, MOVE_QUICK_ATTACK .2byte MOVE_SPARK, MOVE_FAKE_TEARS, MOVE_SUBSTITUTE, MOVE_QUICK_ATTACK
.byte BATTLE_FRONTIER_ITEM_PECHA_BERRY .byte BATTLE_FRONTIER_ITEM_PECHA_BERRY
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_MILD .4byte NATURE_MILD
; 66 @ 66
.2byte SPECIES_ELECTRIKE .2byte SPECIES_ELECTRIKE
.2byte MOVE_SPARK, MOVE_CHARGE, MOVE_ROAR, MOVE_THUNDER_WAVE .2byte MOVE_SPARK, MOVE_CHARGE, MOVE_ROAR, MOVE_THUNDER_WAVE
.byte BATTLE_FRONTIER_ITEM_APICOT_BERRY .byte BATTLE_FRONTIER_ITEM_APICOT_BERRY
.byte F_EV_SPREAD_SPEED .byte F_EV_SPREAD_SPEED
.4byte NATURE_TIMID .4byte NATURE_TIMID
; 67 @ 67
.2byte SPECIES_SWABLU .2byte SPECIES_SWABLU
.2byte MOVE_SING, MOVE_PECK, MOVE_STEEL_WING, MOVE_SAFEGUARD .2byte MOVE_SING, MOVE_PECK, MOVE_STEEL_WING, MOVE_SAFEGUARD
.byte BATTLE_FRONTIER_ITEM_NONE .byte BATTLE_FRONTIER_ITEM_NONE
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
.4byte NATURE_JOLLY .4byte NATURE_JOLLY
; 68 @ 68
.2byte SPECIES_MACHOP .2byte SPECIES_MACHOP
.2byte MOVE_FOCUS_ENERGY, MOVE_VITAL_THROW, MOVE_SEISMIC_TOSS, MOVE_FORESIGHT .2byte MOVE_FOCUS_ENERGY, MOVE_VITAL_THROW, MOVE_SEISMIC_TOSS, MOVE_FORESIGHT
.byte BATTLE_FRONTIER_ITEM_BLACK_BELT .byte BATTLE_FRONTIER_ITEM_BLACK_BELT
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 69 @ 69
.2byte SPECIES_MACHOKE .2byte SPECIES_MACHOKE
.2byte MOVE_FOCUS_ENERGY, MOVE_LEER, MOVE_KARATE_CHOP, MOVE_FORESIGHT .2byte MOVE_FOCUS_ENERGY, MOVE_LEER, MOVE_KARATE_CHOP, MOVE_FORESIGHT
.byte BATTLE_FRONTIER_ITEM_NONE .byte BATTLE_FRONTIER_ITEM_NONE
data/battle_frontier/slateport_battle_tent_trainer_mons.s
+30 -30
View File
@@ -1,6 +1,6 @@
.align 1, 0 .align 1, 0
gSlateportBattleTentTrainerMons_Jolie: ; 85DD70C gSlateportBattleTentTrainerMons_Jolie: @ 85DD70C
.2byte 9 .2byte 9
.2byte 10 .2byte 10
.2byte 13 .2byte 13
@@ -14,7 +14,7 @@ gSlateportBattleTentTrainerMons_Jolie: ; 85DD70C
.2byte 63 .2byte 63
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Malachi: ; 85DD724 gSlateportBattleTentTrainerMons_Malachi: @ 85DD724
.2byte 9 .2byte 9
.2byte 16 .2byte 16
.2byte 17 .2byte 17
@@ -28,7 +28,7 @@ gSlateportBattleTentTrainerMons_Malachi: ; 85DD724
.2byte 53 .2byte 53
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Kelsie: ; 85DD73C gSlateportBattleTentTrainerMons_Kelsie: @ 85DD73C
.2byte 4 .2byte 4
.2byte 5 .2byte 5
.2byte 6 .2byte 6
@@ -42,7 +42,7 @@ gSlateportBattleTentTrainerMons_Kelsie: ; 85DD73C
.2byte 53 .2byte 53
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Davon: ; 85DD754 gSlateportBattleTentTrainerMons_Davon: @ 85DD754
.2byte 4 .2byte 4
.2byte 5 .2byte 5
.2byte 6 .2byte 6
@@ -57,7 +57,7 @@ gSlateportBattleTentTrainerMons_Davon: ; 85DD754
.2byte 50 .2byte 50
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Glenda: ; 85DD76E gSlateportBattleTentTrainerMons_Glenda: @ 85DD76E
.2byte 0 .2byte 0
.2byte 1 .2byte 1
.2byte 17 .2byte 17
@@ -73,7 +73,7 @@ gSlateportBattleTentTrainerMons_Glenda: ; 85DD76E
.2byte 66 .2byte 66
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Helena: ; 85DD78A gSlateportBattleTentTrainerMons_Helena: @ 85DD78A
.2byte 18 .2byte 18
.2byte 19 .2byte 19
.2byte 21 .2byte 21
@@ -87,7 +87,7 @@ gSlateportBattleTentTrainerMons_Helena: ; 85DD78A
.2byte 63 .2byte 63
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Rodolfo: ; 85DD7A2 gSlateportBattleTentTrainerMons_Rodolfo: @ 85DD7A2
.2byte 0 .2byte 0
.2byte 1 .2byte 1
.2byte 4 .2byte 4
@@ -103,7 +103,7 @@ gSlateportBattleTentTrainerMons_Rodolfo: ; 85DD7A2
.2byte 62 .2byte 62
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Davion: ; 85DD7BE gSlateportBattleTentTrainerMons_Davion: @ 85DD7BE
.2byte 17 .2byte 17
.2byte 23 .2byte 23
.2byte 24 .2byte 24
@@ -120,7 +120,7 @@ gSlateportBattleTentTrainerMons_Davion: ; 85DD7BE
.2byte 69 .2byte 69
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Kendall: ; 85DD7DC gSlateportBattleTentTrainerMons_Kendall: @ 85DD7DC
.2byte 4 .2byte 4
.2byte 7 .2byte 7
.2byte 8 .2byte 8
@@ -137,7 +137,7 @@ gSlateportBattleTentTrainerMons_Kendall: ; 85DD7DC
.2byte 63 .2byte 63
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Colten: ; 85DD7FA gSlateportBattleTentTrainerMons_Colten: @ 85DD7FA
.2byte 0 .2byte 0
.2byte 2 .2byte 2
.2byte 12 .2byte 12
@@ -152,7 +152,7 @@ gSlateportBattleTentTrainerMons_Colten: ; 85DD7FA
.2byte 57 .2byte 57
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Irvin: ; 85DD814 gSlateportBattleTentTrainerMons_Irvin: @ 85DD814
.2byte 0 .2byte 0
.2byte 1 .2byte 1
.2byte 2 .2byte 2
@@ -168,7 +168,7 @@ gSlateportBattleTentTrainerMons_Irvin: ; 85DD814
.2byte 60 .2byte 60
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Shaun: ; 85DD830 gSlateportBattleTentTrainerMons_Shaun: @ 85DD830
.2byte 17 .2byte 17
.2byte 18 .2byte 18
.2byte 19 .2byte 19
@@ -184,7 +184,7 @@ gSlateportBattleTentTrainerMons_Shaun: ; 85DD830
.2byte 69 .2byte 69
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Kyler: ; 85DD84C gSlateportBattleTentTrainerMons_Kyler: @ 85DD84C
.2byte 22 .2byte 22
.2byte 23 .2byte 23
.2byte 28 .2byte 28
@@ -199,7 +199,7 @@ gSlateportBattleTentTrainerMons_Kyler: ; 85DD84C
.2byte 67 .2byte 67
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Maggie: ; 85DD866 gSlateportBattleTentTrainerMons_Maggie: @ 85DD866
.2byte 10 .2byte 10
.2byte 13 .2byte 13
.2byte 17 .2byte 17
@@ -213,7 +213,7 @@ gSlateportBattleTentTrainerMons_Maggie: ; 85DD866
.2byte 63 .2byte 63
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Stephon: ; 85DD87E gSlateportBattleTentTrainerMons_Stephon: @ 85DD87E
.2byte 8 .2byte 8
.2byte 10 .2byte 10
.2byte 16 .2byte 16
@@ -227,7 +227,7 @@ gSlateportBattleTentTrainerMons_Stephon: ; 85DD87E
.2byte 68 .2byte 68
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Rebecca: ; 85DD896 gSlateportBattleTentTrainerMons_Rebecca: @ 85DD896
.2byte 8 .2byte 8
.2byte 13 .2byte 13
.2byte 21 .2byte 21
@@ -241,7 +241,7 @@ gSlateportBattleTentTrainerMons_Rebecca: ; 85DD896
.2byte 68 .2byte 68
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Reggie: ; 85DD8AE gSlateportBattleTentTrainerMons_Reggie: @ 85DD8AE
.2byte 6 .2byte 6
.2byte 7 .2byte 7
.2byte 17 .2byte 17
@@ -256,7 +256,7 @@ gSlateportBattleTentTrainerMons_Reggie: ; 85DD8AE
.2byte 65 .2byte 65
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Janae: ; 85DD8C8 gSlateportBattleTentTrainerMons_Janae: @ 85DD8C8
.2byte 0 .2byte 0
.2byte 1 .2byte 1
.2byte 27 .2byte 27
@@ -271,7 +271,7 @@ gSlateportBattleTentTrainerMons_Janae: ; 85DD8C8
.2byte 65 .2byte 65
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Caiden: ; 85DD8E2 gSlateportBattleTentTrainerMons_Caiden: @ 85DD8E2
.2byte 10 .2byte 10
.2byte 14 .2byte 14
.2byte 15 .2byte 15
@@ -287,7 +287,7 @@ gSlateportBattleTentTrainerMons_Caiden: ; 85DD8E2
.2byte 69 .2byte 69
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Kirsten: ; 85DD8FE gSlateportBattleTentTrainerMons_Kirsten: @ 85DD8FE
.2byte 10 .2byte 10
.2byte 16 .2byte 16
.2byte 18 .2byte 18
@@ -303,7 +303,7 @@ gSlateportBattleTentTrainerMons_Kirsten: ; 85DD8FE
.2byte 69 .2byte 69
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Kurtis: ; 85DD91A gSlateportBattleTentTrainerMons_Kurtis: @ 85DD91A
.2byte 0 .2byte 0
.2byte 1 .2byte 1
.2byte 36 .2byte 36
@@ -317,7 +317,7 @@ gSlateportBattleTentTrainerMons_Kurtis: ; 85DD91A
.2byte 68 .2byte 68
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Stefan: ; 85DD932 gSlateportBattleTentTrainerMons_Stefan: @ 85DD932
.2byte 4 .2byte 4
.2byte 5 .2byte 5
.2byte 21 .2byte 21
@@ -331,7 +331,7 @@ gSlateportBattleTentTrainerMons_Stefan: ; 85DD932
.2byte 65 .2byte 65
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Avery: ; 85DD94A gSlateportBattleTentTrainerMons_Avery: @ 85DD94A
.2byte 2 .2byte 2
.2byte 3 .2byte 3
.2byte 7 .2byte 7
@@ -345,7 +345,7 @@ gSlateportBattleTentTrainerMons_Avery: ; 85DD94A
.2byte 67 .2byte 67
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Dwane: ; 85DD962 gSlateportBattleTentTrainerMons_Dwane: @ 85DD962
.2byte 14 .2byte 14
.2byte 15 .2byte 15
.2byte 30 .2byte 30
@@ -359,7 +359,7 @@ gSlateportBattleTentTrainerMons_Dwane: ; 85DD962
.2byte 63 .2byte 63
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Mckenna: ; 85DD97A gSlateportBattleTentTrainerMons_Mckenna: @ 85DD97A
.2byte 27 .2byte 27
.2byte 29 .2byte 29
.2byte 30 .2byte 30
@@ -373,7 +373,7 @@ gSlateportBattleTentTrainerMons_Mckenna: ; 85DD97A
.2byte 67 .2byte 67
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Camryn: ; 85DD992 gSlateportBattleTentTrainerMons_Camryn: @ 85DD992
.2byte 5 .2byte 5
.2byte 6 .2byte 6
.2byte 7 .2byte 7
@@ -388,7 +388,7 @@ gSlateportBattleTentTrainerMons_Camryn: ; 85DD992
.2byte 44 .2byte 44
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Natasha: ; 85DD9AC gSlateportBattleTentTrainerMons_Natasha: @ 85DD9AC
.2byte 1 .2byte 1
.2byte 3 .2byte 3
.2byte 4 .2byte 4
@@ -402,7 +402,7 @@ gSlateportBattleTentTrainerMons_Natasha: ; 85DD9AC
.2byte 51 .2byte 51
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Austyn: ; 85DD9C4 gSlateportBattleTentTrainerMons_Austyn: @ 85DD9C4
.2byte 25 .2byte 25
.2byte 31 .2byte 31
.2byte 35 .2byte 35
@@ -417,7 +417,7 @@ gSlateportBattleTentTrainerMons_Austyn: ; 85DD9C4
.2byte 69 .2byte 69
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Donovan: ; 85DD9DE gSlateportBattleTentTrainerMons_Donovan: @ 85DD9DE
.2byte 10 .2byte 10
.2byte 16 .2byte 16
.2byte 17 .2byte 17
@@ -434,7 +434,7 @@ gSlateportBattleTentTrainerMons_Donovan: ; 85DD9DE
.2byte 65 .2byte 65
.2byte -1 .2byte -1
gSlateportBattleTentTrainerMons_Tamia: ; 85DD9FC gSlateportBattleTentTrainerMons_Tamia: @ 85DD9FC
.2byte 2 .2byte 2
.2byte 6 .2byte 6
.2byte 9 .2byte 9
data/battle_frontier/slateport_battle_tent_trainers.s
+121 -121
View File
@@ -1,24 +1,24 @@
.align 2, 0 .align 2, 0
gSlateportBattleTentTrainers: ; 85DDA14 gSlateportBattleTentTrainers: @ 85DDA14
; 0 @ 0
.4byte TRAINER_CLASS_AROMA_LADY .4byte TRAINER_CLASS_AROMA_LADY
.charmapstr "JOLIE$", 8 .charmapstr "JOLIE$", 8
; pre-battle speech @ pre-battle speech
ec_word WHAT ec_word WHAT
ec_word WILL ec_word WILL
ec_word I ec_word I
ec_word BE ec_word BE
ec_word TOMORROW ec_word TOMORROW
ec_word QUES ec_word QUES
; win speech @ win speech
ec_word I_AM ec_word I_AM
ec_word FEELING ec_word FEELING
ec_word LIKE ec_word LIKE
ec_word IT_S ec_word IT_S
ec_word FRIDAY ec_word FRIDAY
ec_word EXCL ec_word EXCL
; loss speech @ loss speech
ec_word I_AM ec_word I_AM
ec_word FEELING ec_word FEELING
ec_word LIKE ec_word LIKE
@@ -27,24 +27,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
ec_word ELLIPSIS ec_word ELLIPSIS
.4byte gSlateportBattleTentTrainerMons_Jolie .4byte gSlateportBattleTentTrainerMons_Jolie
; 1 @ 1
.4byte TRAINER_CLASS_RUIN_MANIAC .4byte TRAINER_CLASS_RUIN_MANIAC
.charmapstr "MALACHI$", 8 .charmapstr "MALACHI$", 8
; pre-battle speech @ pre-battle speech
ec_word BAD ec_word BAD
ec_word NEWS ec_word NEWS
ec_word EXCL ec_word EXCL
ec_word IT_S ec_word IT_S
ec_word A ec_word A
ec_move1 SAND_TOMB ec_move1 SAND_TOMB
; win speech @ win speech
ec_word YEEHAW_EXCL ec_word YEEHAW_EXCL
.2byte -1 .2byte -1
.2byte -1 .2byte -1
ec_word I_VE ec_word I_VE
ec_word DONE ec_word DONE
ec_word IT ec_word IT
; loss speech @ loss speech
ec_word I_VE ec_word I_VE
ec_word LOST ec_word LOST
ec_word IN ec_word IN
@@ -53,24 +53,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
ec_word ELLIPSIS ec_word ELLIPSIS
.4byte gSlateportBattleTentTrainerMons_Malachi .4byte gSlateportBattleTentTrainerMons_Malachi
; 2 @ 2
.4byte TRAINER_CLASS_TUBER_1 .4byte TRAINER_CLASS_TUBER_1
.charmapstr "KELSIE$", 8 .charmapstr "KELSIE$", 8
; pre-battle speech @ pre-battle speech
ec_word GO ec_word GO
ec_word EXCL_EXCL ec_word EXCL_EXCL
ec_word MY ec_word MY
ec_word BATH ec_word BATH
ec_word POKEMON ec_word POKEMON
ec_word EXCL_EXCL ec_word EXCL_EXCL
; win speech @ win speech
ec_word YAHOO ec_word YAHOO
ec_word EXCL_EXCL ec_word EXCL_EXCL
ec_word MY ec_word MY
ec_word BATH ec_word BATH
ec_word POKEMON ec_word POKEMON
ec_word EXCL_EXCL ec_word EXCL_EXCL
; loss speech @ loss speech
ec_word GWAH ec_word GWAH
ec_word EXCL_EXCL ec_word EXCL_EXCL
ec_word MY ec_word MY
@@ -79,24 +79,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
ec_word EXCL_EXCL ec_word EXCL_EXCL
.4byte gSlateportBattleTentTrainerMons_Kelsie .4byte gSlateportBattleTentTrainerMons_Kelsie
; 3 @ 3
.4byte TRAINER_CLASS_TUBER_2 .4byte TRAINER_CLASS_TUBER_2
.charmapstr "DAVON$", 8 .charmapstr "DAVON$", 8
; pre-battle speech @ pre-battle speech
ec_word YEAH_YEAH ec_word YEAH_YEAH
ec_word EXCL_EXCL ec_word EXCL_EXCL
.2byte -1 .2byte -1
ec_word GREAT ec_word GREAT
ec_move1 WHIRLPOOL ec_move1 WHIRLPOOL
ec_word ISN_T_IT_QUES ec_word ISN_T_IT_QUES
; win speech @ win speech
ec_word THAT_WAS ec_word THAT_WAS
ec_word LIKE ec_word LIKE
ec_word A ec_word A
ec_move1 WHIRLPOOL ec_move1 WHIRLPOOL
ec_word YEAH_YEAH ec_word YEAH_YEAH
ec_word EXCL_EXCL ec_word EXCL_EXCL
; loss speech @ loss speech
ec_word DON_T ec_word DON_T
ec_word GET ec_word GET
ec_move2 BEAT_UP ec_move2 BEAT_UP
@@ -105,24 +105,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
ec_move1 WHIRLPOOL ec_move1 WHIRLPOOL
.4byte gSlateportBattleTentTrainerMons_Davon .4byte gSlateportBattleTentTrainerMons_Davon
; 4 @ 4
.4byte TRAINER_CLASS_LADY .4byte TRAINER_CLASS_LADY
.charmapstr "GLENDA$", 8 .charmapstr "GLENDA$", 8
; pre-battle speech @ pre-battle speech
ec_word CONVERSATION ec_word CONVERSATION
ec_word CAN ec_word CAN
ec_word WAIT ec_word WAIT
ec_word UNTIL ec_word UNTIL
ec_word I ec_word I
ec_word WIN ec_word WIN
; win speech @ win speech
ec_word FABULOUS ec_word FABULOUS
ec_word EXCL ec_word EXCL
ec_word I_AM ec_word I_AM
ec_word GOING ec_word GOING
ec_word TO ec_word TO
ec_word ROCK ec_word ROCK
; loss speech @ loss speech
ec_word NO ec_word NO
ec_word EXCL ec_word EXCL
.2byte -1 .2byte -1
@@ -131,24 +131,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
ec_word SERIOUS ec_word SERIOUS
.4byte gSlateportBattleTentTrainerMons_Glenda .4byte gSlateportBattleTentTrainerMons_Glenda
; 5 @ 5
.4byte TRAINER_CLASS_BEAUTY .4byte TRAINER_CLASS_BEAUTY
.charmapstr "HELENA$", 8 .charmapstr "HELENA$", 8
; pre-battle speech @ pre-battle speech
ec_word DOES ec_word DOES
ec_word MY ec_word MY
ec_word BEAUTY ec_word BEAUTY
ec_word INTIMIDATE ec_word INTIMIDATE
ec_word YOU ec_word YOU
ec_word QUES ec_word QUES
; win speech @ win speech
ec_word I_AM ec_word I_AM
ec_word SO ec_word SO
ec_word SORRY ec_word SORRY
ec_word BUT ec_word BUT
ec_word YOU_RE ec_word YOU_RE
ec_word BORING ec_word BORING
; loss speech @ loss speech
ec_word I ec_word I
ec_word DO ec_word DO
ec_word SO ec_word SO
@@ -157,24 +157,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
ec_word EXCL ec_word EXCL
.4byte gSlateportBattleTentTrainerMons_Helena .4byte gSlateportBattleTentTrainerMons_Helena
; 6 @ 6
.4byte TRAINER_CLASS_RICH_BOY .4byte TRAINER_CLASS_RICH_BOY
.charmapstr "RODOLFO$", 8 .charmapstr "RODOLFO$", 8
; pre-battle speech @ pre-battle speech
ec_word GO ec_word GO
ec_word GET ec_word GET
ec_word A ec_word A
ec_pokemon1 WHISCASH ec_pokemon1 WHISCASH
ec_word FOR ec_word FOR
ec_word ME ec_word ME
; win speech @ win speech
ec_word AWW ec_word AWW
ec_word YOU ec_word YOU
ec_word DON_T ec_word DON_T
ec_word HAVE ec_word HAVE
ec_word A ec_word A
ec_pokemon1 WHISCASH ec_pokemon1 WHISCASH
; loss speech @ loss speech
ec_word PLEASE ec_word PLEASE
ec_word I ec_word I
ec_word NEED ec_word NEED
@@ -183,24 +183,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
ec_word BADLY ec_word BADLY
.4byte gSlateportBattleTentTrainerMons_Rodolfo .4byte gSlateportBattleTentTrainerMons_Rodolfo
; 7 @ 7
.4byte TRAINER_CLASS_POKEMANIAC .4byte TRAINER_CLASS_POKEMANIAC
.charmapstr "DAVION$", 8 .charmapstr "DAVION$", 8
; pre-battle speech @ pre-battle speech
ec_word GRAAAH ec_word GRAAAH
ec_word GRAAAH ec_word GRAAAH
ec_word EXCL_EXCL ec_word EXCL_EXCL
ec_word GRAAAH ec_word GRAAAH
ec_word GRAAAH ec_word GRAAAH
ec_word EXCL_EXCL ec_word EXCL_EXCL
; win speech @ win speech
ec_move2 ROAR ec_move2 ROAR
ec_word EXCL ec_word EXCL
.2byte -1 .2byte -1
ec_move2 ROAR ec_move2 ROAR
ec_word EXCL_EXCL ec_word EXCL_EXCL
.2byte -1 .2byte -1
; loss speech @ loss speech
ec_word URGH ec_word URGH
ec_word WAAAH ec_word WAAAH
ec_word EXCL_EXCL ec_word EXCL_EXCL
@@ -209,24 +209,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
.2byte -1 .2byte -1
.4byte gSlateportBattleTentTrainerMons_Davion .4byte gSlateportBattleTentTrainerMons_Davion
; 8 @ 8
.4byte TRAINER_CLASS_SWIMMER_M .4byte TRAINER_CLASS_SWIMMER_M
.charmapstr "KENDALL$", 8 .charmapstr "KENDALL$", 8
; pre-battle speech @ pre-battle speech
ec_word A_LITTLE ec_word A_LITTLE
ec_move2 PETAL_DANCE ec_move2 PETAL_DANCE
ec_word TO ec_word TO
ec_word PLEASE ec_word PLEASE
ec_word YOU ec_word YOU
ec_word EXCL ec_word EXCL
; win speech @ win speech
ec_word I ec_word I
ec_word DO ec_word DO
ec_word THIS ec_word THIS
ec_word ONLY ec_word ONLY
ec_word FOR ec_word FOR
ec_word WORK ec_word WORK
; loss speech @ loss speech
ec_word HOW ec_word HOW
ec_word COULD ec_word COULD
ec_word YOU ec_word YOU
@@ -235,24 +235,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
ec_word QUES ec_word QUES
.4byte gSlateportBattleTentTrainerMons_Kendall .4byte gSlateportBattleTentTrainerMons_Kendall
; 9 @ 9
.4byte TRAINER_CLASS_CAMPER .4byte TRAINER_CLASS_CAMPER
.charmapstr "COLTEN$", 8 .charmapstr "COLTEN$", 8
; pre-battle speech @ pre-battle speech
ec_word I ec_word I
ec_word WANT ec_word WANT
ec_word TO ec_word TO
ec_word GO ec_word GO
ec_word RUN ec_word RUN
ec_word AROUND ec_word AROUND
; win speech @ win speech
ec_word YAY ec_word YAY
ec_word EXCL ec_word EXCL
ec_word WANT ec_word WANT
ec_word TO ec_word TO
ec_word RUN ec_word RUN
ec_word QUES ec_word QUES
; loss speech @ loss speech
ec_word A ec_word A
ec_word SWIFT_SWIM ec_word SWIFT_SWIM
ec_word WOULD ec_word WOULD
@@ -261,24 +261,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
ec_word TOO ec_word TOO
.4byte gSlateportBattleTentTrainerMons_Colten .4byte gSlateportBattleTentTrainerMons_Colten
; 10 @ 10
.4byte TRAINER_CLASS_BUG_MANIAC .4byte TRAINER_CLASS_BUG_MANIAC
.charmapstr "IRVIN$", 8 .charmapstr "IRVIN$", 8
; pre-battle speech @ pre-battle speech
ec_word HAVE ec_word HAVE
ec_word A ec_word A
ec_word LOOK ec_word LOOK
ec_word AT ec_word AT
ec_word MY ec_word MY
ec_move1 CONFUSE_RAY ec_move1 CONFUSE_RAY
; win speech @ win speech
ec_word YAHOO ec_word YAHOO
ec_word MY ec_word MY
ec_move1 CONFUSE_RAY ec_move1 CONFUSE_RAY
ec_word IS ec_word IS
ec_word THE ec_word THE
ec_word BEST ec_word BEST
; loss speech @ loss speech
ec_word GWAH ec_word GWAH
ec_word EXCL_EXCL ec_word EXCL_EXCL
.2byte -1 .2byte -1
@@ -287,24 +287,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
ec_word EXCL ec_word EXCL
.4byte gSlateportBattleTentTrainerMons_Irvin .4byte gSlateportBattleTentTrainerMons_Irvin
; 11 @ 11
.4byte TRAINER_CLASS_GENTLEMAN .4byte TRAINER_CLASS_GENTLEMAN
.charmapstr "SHAUN$", 8 .charmapstr "SHAUN$", 8
; pre-battle speech @ pre-battle speech
ec_word LISTEN ec_word LISTEN
ec_word ELLIPSIS ec_word ELLIPSIS
ec_word YOU ec_word YOU
ec_word AREN_T ec_word AREN_T
ec_word VERY ec_word VERY
ec_word GOOD ec_word GOOD
; win speech @ win speech
ec_word YOU ec_word YOU
ec_word SEE ec_word SEE
ec_word QUES ec_word QUES
ec_word I ec_word I
ec_word WAS ec_word WAS
ec_word RIGHT ec_word RIGHT
; loss speech @ loss speech
ec_word YES ec_word YES
ec_word YES ec_word YES
ec_word ELLIPSIS ec_word ELLIPSIS
@@ -313,24 +313,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
ec_word SOMETHING ec_word SOMETHING
.4byte gSlateportBattleTentTrainerMons_Shaun .4byte gSlateportBattleTentTrainerMons_Shaun
; 12 @ 12
.4byte TRAINER_CLASS_GUITARIST .4byte TRAINER_CLASS_GUITARIST
.charmapstr "KYLER$", 8 .charmapstr "KYLER$", 8
; pre-battle speech @ pre-battle speech
ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
ec_word QUES ec_word QUES
; win speech @ win speech
ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
ec_word YAY ec_word YAY
; loss speech @ loss speech
ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
@@ -339,24 +339,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
ec_word WOW ec_word WOW
.4byte gSlateportBattleTentTrainerMons_Kyler .4byte gSlateportBattleTentTrainerMons_Kyler
; 13 @ 13
.4byte TRAINER_CLASS_SCHOOL_KID_2 .4byte TRAINER_CLASS_SCHOOL_KID_2
.charmapstr "MAGGIE$", 8 .charmapstr "MAGGIE$", 8
; pre-battle speech @ pre-battle speech
ec_pokemon1 VULPIX ec_pokemon1 VULPIX
ec_pokemon1 XATU ec_pokemon1 XATU
ec_pokemon2 UMBREON ec_pokemon2 UMBREON
ec_word ELLIPSIS ec_word ELLIPSIS
ec_word UM ec_word UM
ec_word ELLIPSIS ec_word ELLIPSIS
; win speech @ win speech
ec_pokemon1 NOSEPASS ec_pokemon1 NOSEPASS
ec_word ELLIPSIS ec_word ELLIPSIS
ec_word UM ec_word UM
ec_pokemon1 SEVIPER ec_pokemon1 SEVIPER
ec_word EXCL ec_word EXCL
.2byte -1 .2byte -1
; loss speech @ loss speech
ec_pokemon1 NOSEPASS ec_pokemon1 NOSEPASS
ec_word ELLIPSIS ec_word ELLIPSIS
ec_word UM ec_word UM
@@ -365,24 +365,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
ec_word UH_OH ec_word UH_OH
.4byte gSlateportBattleTentTrainerMons_Maggie .4byte gSlateportBattleTentTrainerMons_Maggie
; 14 @ 14
.4byte TRAINER_CLASS_COOLTRAINER_1 .4byte TRAINER_CLASS_COOLTRAINER_1
.charmapstr "STEPHON$", 8 .charmapstr "STEPHON$", 8
; pre-battle speech @ pre-battle speech
ec_word I_AM ec_word I_AM
ec_word GOING ec_word GOING
ec_word TO ec_word TO
ec_word ENJOY ec_word ENJOY
ec_word AN ec_word AN
ec_word EGG ec_word EGG
; win speech @ win speech
ec_word I ec_word I
ec_word WILL ec_word WILL
ec_word ENJOY ec_word ENJOY
ec_word THIS ec_word THIS
ec_word TASTY ec_word TASTY
ec_word VICTORY ec_word VICTORY
; loss speech @ loss speech
ec_word AWFUL ec_word AWFUL
ec_word EXCL_EXCL ec_word EXCL_EXCL
.2byte -1 .2byte -1
@@ -391,24 +391,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
ec_word EXCL_EXCL ec_word EXCL_EXCL
.4byte gSlateportBattleTentTrainerMons_Stephon .4byte gSlateportBattleTentTrainerMons_Stephon
; 15 @ 15
.4byte TRAINER_CLASS_COOLTRAINER_2 .4byte TRAINER_CLASS_COOLTRAINER_2
.charmapstr "REBECCA$", 8 .charmapstr "REBECCA$", 8
; pre-battle speech @ pre-battle speech
ec_word THAT ec_word THAT
ec_word EGG ec_word EGG
ec_word HAS ec_word HAS
ec_word A ec_word A
ec_word TASTY ec_word TASTY
ec_word SHINE ec_word SHINE
; win speech @ win speech
ec_word I ec_word I
ec_word CAN_T ec_word CAN_T
ec_word EXCL ec_word EXCL
ec_word SMELL ec_word SMELL
ec_word THAT ec_word THAT
ec_word STENCH ec_word STENCH
; loss speech @ loss speech
ec_word YOU ec_word YOU
ec_word CAN_T ec_word CAN_T
ec_word MAKE ec_word MAKE
@@ -417,24 +417,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
ec_word ELLIPSIS ec_word ELLIPSIS
.4byte gSlateportBattleTentTrainerMons_Rebecca .4byte gSlateportBattleTentTrainerMons_Rebecca
; 16 @ 16
.4byte TRAINER_CLASS_POKEFAN_1 .4byte TRAINER_CLASS_POKEFAN_1
.charmapstr "REGGIE$", 8 .charmapstr "REGGIE$", 8
; pre-battle speech @ pre-battle speech
ec_word POKEMON ec_word POKEMON
ec_word COME ec_word COME
ec_word BEFORE ec_word BEFORE
ec_word MONEY ec_word MONEY
ec_word OR ec_word OR
ec_word FAMILY ec_word FAMILY
; win speech @ win speech
ec_word THAT_S ec_word THAT_S
ec_word WHAT ec_word WHAT
ec_word IS ec_word IS
ec_word MAKING ec_word MAKING
ec_word ME ec_word ME
ec_word STRONG ec_word STRONG
; loss speech @ loss speech
ec_word THAT_S ec_word THAT_S
ec_word WHY ec_word WHY
ec_word I_AM ec_word I_AM
@@ -443,24 +443,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
ec_word ELLIPSIS ec_word ELLIPSIS
.4byte gSlateportBattleTentTrainerMons_Reggie .4byte gSlateportBattleTentTrainerMons_Reggie
; 17 @ 17
.4byte TRAINER_CLASS_POKEFAN_2 .4byte TRAINER_CLASS_POKEFAN_2
.charmapstr "JANAE$", 8 .charmapstr "JANAE$", 8
; pre-battle speech @ pre-battle speech
ec_word I ec_word I
ec_word JUST ec_word JUST
ec_word ADORE ec_word ADORE
ec_word YOUR ec_word YOUR
ec_word TOUGH ec_word TOUGH
ec_word LOOK ec_word LOOK
; win speech @ win speech
ec_word I ec_word I
ec_word LIKE ec_word LIKE
ec_word HOW ec_word HOW
ec_word YOU ec_word YOU
ec_move2 STRUGGLE ec_move2 STRUGGLE
.2byte -1 .2byte -1
; loss speech @ loss speech
ec_word YOU_RE ec_word YOU_RE
ec_word A ec_word A
ec_word MEAN ec_word MEAN
@@ -469,24 +469,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
ec_word TRAINER ec_word TRAINER
.4byte gSlateportBattleTentTrainerMons_Janae .4byte gSlateportBattleTentTrainerMons_Janae
; 18 @ 18
.4byte TRAINER_CLASS_EXPERT_1 .4byte TRAINER_CLASS_EXPERT_1
.charmapstr "CAIDEN$", 8 .charmapstr "CAIDEN$", 8
; pre-battle speech @ pre-battle speech
ec_word MY ec_word MY
ec_move2 CURSE ec_move2 CURSE
ec_word WILL ec_word WILL
ec_word BREAK ec_word BREAK
ec_word YOUR ec_word YOUR
ec_word SPIRIT ec_word SPIRIT
; win speech @ win speech
ec_move2 CURSE ec_move2 CURSE
ec_word QUES ec_word QUES
ec_word IT_S ec_word IT_S
ec_word A ec_word A
ec_word LIE ec_word LIE
ec_word ELLIPSIS ec_word ELLIPSIS
; loss speech @ loss speech
ec_word MY ec_word MY
ec_move2 CURSE ec_move2 CURSE
ec_word WILL ec_word WILL
@@ -495,24 +495,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
.2byte -1 .2byte -1
.4byte gSlateportBattleTentTrainerMons_Caiden .4byte gSlateportBattleTentTrainerMons_Caiden
; 19 @ 19
.4byte TRAINER_CLASS_EXPERT_2 .4byte TRAINER_CLASS_EXPERT_2
.charmapstr "KIRSTEN$", 8 .charmapstr "KIRSTEN$", 8
; pre-battle speech @ pre-battle speech
ec_word HUH_QUES ec_word HUH_QUES
ec_word A ec_word A
ec_word BATTLE ec_word BATTLE
ec_word YOU ec_word YOU
ec_word SAID ec_word SAID
ec_word QUES ec_word QUES
; win speech @ win speech
ec_word HUH_QUES ec_word HUH_QUES
ec_word STRONG ec_word STRONG
ec_word BUT ec_word BUT
ec_word NOT ec_word NOT
ec_word STRONG ec_word STRONG
ec_word ENOUGH ec_word ENOUGH
; loss speech @ loss speech
ec_word HUH_QUES ec_word HUH_QUES
ec_word I ec_word I
ec_word SURRENDER ec_word SURRENDER
@@ -521,24 +521,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
ec_move1 STRENGTH ec_move1 STRENGTH
.4byte gSlateportBattleTentTrainerMons_Kirsten .4byte gSlateportBattleTentTrainerMons_Kirsten
; 20 @ 20
.4byte TRAINER_CLASS_YOUNGSTER .4byte TRAINER_CLASS_YOUNGSTER
.charmapstr "KURTIS$", 8 .charmapstr "KURTIS$", 8
; pre-battle speech @ pre-battle speech
ec_word SORRY ec_word SORRY
ec_word YOU_RE ec_word YOU_RE
ec_word GOING ec_word GOING
ec_word TO ec_word TO
ec_word GET ec_word GET
ec_move2 BEAT_UP ec_move2 BEAT_UP
; win speech @ win speech
ec_word I ec_word I
ec_word SAID ec_word SAID
ec_word WE ec_word WE
ec_word WOULD ec_word WOULD
ec_move2 POUND ec_move2 POUND
ec_word YOU ec_word YOU
; loss speech @ loss speech
ec_word HOW ec_word HOW
ec_word DID ec_word DID
ec_word I ec_word I
@@ -547,24 +547,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
ec_word QUES ec_word QUES
.4byte gSlateportBattleTentTrainerMons_Kurtis .4byte gSlateportBattleTentTrainerMons_Kurtis
; 21 @ 21
.4byte TRAINER_CLASS_FISHERMAN .4byte TRAINER_CLASS_FISHERMAN
.charmapstr "STEFAN$", 8 .charmapstr "STEFAN$", 8
; pre-battle speech @ pre-battle speech
ec_word I ec_word I
ec_word ONLY ec_word ONLY
ec_word WANT ec_word WANT
ec_word CUTE ec_word CUTE
ec_word POKEMON ec_word POKEMON
.2byte -1 .2byte -1
; win speech @ win speech
ec_word WHAT ec_word WHAT
ec_word IS ec_word IS
ec_word IT ec_word IT
ec_word TO ec_word TO
ec_word YOU ec_word YOU
ec_word QUES ec_word QUES
; loss speech @ loss speech
ec_word YOU_RE ec_word YOU_RE
ec_word KIND ec_word KIND
ec_word OF ec_word OF
@@ -573,24 +573,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
.2byte -1 .2byte -1
.4byte gSlateportBattleTentTrainerMons_Stefan .4byte gSlateportBattleTentTrainerMons_Stefan
; 22 @ 22
.4byte TRAINER_CLASS_BIRD_KEEPER .4byte TRAINER_CLASS_BIRD_KEEPER
.charmapstr "AVERY$", 8 .charmapstr "AVERY$", 8
; pre-battle speech @ pre-battle speech
ec_word TOYS ec_word TOYS
ec_word EXCL ec_word EXCL
ec_word I ec_word I
ec_word NEED ec_word NEED
ec_word MORE ec_word MORE
ec_word TOYS ec_word TOYS
; win speech @ win speech
ec_word I ec_word I
ec_word NEED ec_word NEED
ec_word SOME ec_word SOME
ec_word EASY ec_word EASY
ec_word MONEY ec_word MONEY
ec_word FAST ec_word FAST
; loss speech @ loss speech
ec_word I ec_word I
ec_word NEED ec_word NEED
ec_word TO ec_word TO
@@ -599,24 +599,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
ec_word MONEY ec_word MONEY
.4byte gSlateportBattleTentTrainerMons_Avery .4byte gSlateportBattleTentTrainerMons_Avery
; 23 @ 23
.4byte TRAINER_CLASS_NINJA_BOY .4byte TRAINER_CLASS_NINJA_BOY
.charmapstr "DWANE$", 8 .charmapstr "DWANE$", 8
; pre-battle speech @ pre-battle speech
ec_word MMM ec_word MMM
ec_word TASTY ec_word TASTY
ec_word ELLIPSIS ec_word ELLIPSIS
ec_word WONDER ec_word WONDER
ec_word WHAT ec_word WHAT
ec_word QUES ec_word QUES
; win speech @ win speech
ec_word MMM ec_word MMM
ec_word MMM ec_word MMM
ec_word ELLIPSIS ec_word ELLIPSIS
ec_word YOU ec_word YOU
ec_word DON_T ec_word DON_T
ec_word KNOW ec_word KNOW
; loss speech @ loss speech
ec_word MMM ec_word MMM
ec_word MMM ec_word MMM
ec_word ELLIPSIS ec_word ELLIPSIS
@@ -625,24 +625,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
.2byte -1 .2byte -1
.4byte gSlateportBattleTentTrainerMons_Dwane .4byte gSlateportBattleTentTrainerMons_Dwane
; 24 @ 24
.4byte TRAINER_CLASS_PARASOL_LADY .4byte TRAINER_CLASS_PARASOL_LADY
.charmapstr "MCKENNA$", 8 .charmapstr "MCKENNA$", 8
; pre-battle speech @ pre-battle speech
ec_word I ec_word I
ec_word DISLIKE ec_word DISLIKE
ec_word SMALL ec_word SMALL
ec_word TALK ec_word TALK
ec_word LET_S ec_word LET_S
ec_word GO ec_word GO
; win speech @ win speech
ec_word YUP ec_word YUP
ec_word THAT_S ec_word THAT_S
ec_word THAT ec_word THAT
.2byte -1 .2byte -1
.2byte -1 .2byte -1
.2byte -1 .2byte -1
; loss speech @ loss speech
ec_word KTHX_BYE ec_word KTHX_BYE
.2byte -1 .2byte -1
.2byte -1 .2byte -1
@@ -651,24 +651,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
.2byte -1 .2byte -1
.4byte gSlateportBattleTentTrainerMons_Mckenna .4byte gSlateportBattleTentTrainerMons_Mckenna
; 25 @ 25
.4byte TRAINER_CLASS_SWIMMER_F .4byte TRAINER_CLASS_SWIMMER_F
.charmapstr "CAMRYN$", 8 .charmapstr "CAMRYN$", 8
; pre-battle speech @ pre-battle speech
ec_word MR ec_word MR
ec_word JUDGE ec_word JUDGE
ec_word YOU ec_word YOU
ec_word HAVE ec_word HAVE
ec_word OUR ec_word OUR
ec_word TRUST ec_word TRUST
; win speech @ win speech
ec_word YES_SIR_EXCL ec_word YES_SIR_EXCL
ec_word WE_RE ec_word WE_RE
ec_word NO_1 ec_word NO_1
ec_word IN ec_word IN
ec_word THIS ec_word THIS
ec_word CONTEST ec_word CONTEST
; loss speech @ loss speech
ec_word I ec_word I
ec_word WON_T ec_word WON_T
ec_word GIVE_UP ec_word GIVE_UP
@@ -677,24 +677,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
ec_word DREAM ec_word DREAM
.4byte gSlateportBattleTentTrainerMons_Camryn .4byte gSlateportBattleTentTrainerMons_Camryn
; 26 @ 26
.4byte TRAINER_CLASS_PICNICKER .4byte TRAINER_CLASS_PICNICKER
.charmapstr "NATASHA$", 8 .charmapstr "NATASHA$", 8
; pre-battle speech @ pre-battle speech
ec_word COME_OVER ec_word COME_OVER
ec_word TO ec_word TO
ec_word MY ec_word MY
ec_word PLACE ec_word PLACE
ec_word OK_QUES ec_word OK_QUES
.2byte -1 .2byte -1
; win speech @ win speech
ec_word COME_ON ec_word COME_ON
ec_word OVER ec_word OVER
ec_word IT ec_word IT
ec_word WILL ec_word WILL
ec_word BE ec_word BE
ec_word GREAT ec_word GREAT
; loss speech @ loss speech
ec_word AWW ec_word AWW
ec_word WON_T ec_word WON_T
ec_word YOU ec_word YOU
@@ -703,24 +703,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
.2byte -1 .2byte -1
.4byte gSlateportBattleTentTrainerMons_Natasha .4byte gSlateportBattleTentTrainerMons_Natasha
; 27 @ 27
.4byte TRAINER_CLASS_SAILOR .4byte TRAINER_CLASS_SAILOR
.charmapstr "AUSTYN$", 8 .charmapstr "AUSTYN$", 8
; pre-battle speech @ pre-battle speech
ec_word I ec_word I
ec_word DON_T ec_word DON_T
ec_word CARE ec_word CARE
ec_word HOW ec_word HOW
ec_word WE ec_word WE
ec_word MATCH_UP ec_word MATCH_UP
; win speech @ win speech
ec_word HAH ec_word HAH
ec_word BACK ec_word BACK
ec_word TO ec_word TO
ec_word SCHOOL ec_word SCHOOL
ec_word FOR ec_word FOR
ec_word YOU ec_word YOU
; loss speech @ loss speech
ec_word I ec_word I
ec_word NEED ec_word NEED
ec_word TO ec_word TO
@@ -729,24 +729,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
ec_word LESSONS ec_word LESSONS
.4byte gSlateportBattleTentTrainerMons_Austyn .4byte gSlateportBattleTentTrainerMons_Austyn
; 28 @ 28
.4byte TRAINER_CLASS_COLLECTOR .4byte TRAINER_CLASS_COLLECTOR
.charmapstr "DONOVAN$", 8 .charmapstr "DONOVAN$", 8
; pre-battle speech @ pre-battle speech
ec_word OH ec_word OH
ec_word I_AM ec_word I_AM
ec_word FEELING ec_word FEELING
ec_word SLIMY ec_word SLIMY
ec_word ALL ec_word ALL
ec_word OVER ec_word OVER
; win speech @ win speech
ec_word YOU_RE ec_word YOU_RE
ec_word GOING ec_word GOING
ec_word DOWN ec_word DOWN
ec_word THE ec_word THE
ec_move2 MEGA_DRAIN ec_move2 MEGA_DRAIN
ec_word HAHAHA ec_word HAHAHA
; loss speech @ loss speech
ec_word I_AM ec_word I_AM
ec_word NATURALLY ec_word NATURALLY
ec_word SLIMY ec_word SLIMY
@@ -755,24 +755,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
ec_word I_AM ec_word I_AM
.4byte gSlateportBattleTentTrainerMons_Donovan .4byte gSlateportBattleTentTrainerMons_Donovan
; 29 @ 29
.4byte TRAINER_CLASS_LASS .4byte TRAINER_CLASS_LASS
.charmapstr "TAMIA$", 8 .charmapstr "TAMIA$", 8
; pre-battle speech @ pre-battle speech
ec_word I_AM ec_word I_AM
ec_word ANGRY ec_word ANGRY
ec_word WITH ec_word WITH
ec_word MY ec_word MY
ec_word FATHER ec_word FATHER
ec_word ELLIPSIS ec_word ELLIPSIS
; win speech @ win speech
ec_word I ec_word I
ec_word REALLY ec_word REALLY
ec_word DISLIKE ec_word DISLIKE
ec_word MY ec_word MY
ec_word FATHER ec_word FATHER
ec_word EXCL ec_word EXCL
; loss speech @ loss speech
ec_word I ec_word I
ec_word JUST ec_word JUST
ec_word SO ec_word SO
data/battle_frontier/verdanturf_battle_tent_mons.s
+46 -46
View File
@@ -1,315 +1,315 @@
.align 2, 0 .align 2, 0
gVerdanturfBattleTentMons: ; 85DEC28 gVerdanturfBattleTentMons: @ 85DEC28
; 0 @ 0
.2byte SPECIES_POOCHYENA .2byte SPECIES_POOCHYENA
.2byte MOVE_ROAR, MOVE_THIEF, MOVE_BITE, MOVE_HOWL .2byte MOVE_ROAR, MOVE_THIEF, MOVE_BITE, MOVE_HOWL
.byte BATTLE_FRONTIER_ITEM_BLACK_GLASSES .byte BATTLE_FRONTIER_ITEM_BLACK_GLASSES
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_NAUGHTY .4byte NATURE_NAUGHTY
; 1 @ 1
.2byte SPECIES_ZIGZAGOON .2byte SPECIES_ZIGZAGOON
.2byte MOVE_COVET, MOVE_GROWL, MOVE_PIN_MISSILE, MOVE_MUD_SPORT .2byte MOVE_COVET, MOVE_GROWL, MOVE_PIN_MISSILE, MOVE_MUD_SPORT
.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 2 @ 2
.2byte SPECIES_DUSTOX .2byte SPECIES_DUSTOX
.2byte MOVE_CONFUSION, MOVE_MOONLIGHT, MOVE_PROTECT, MOVE_FLASH .2byte MOVE_CONFUSION, MOVE_MOONLIGHT, MOVE_PROTECT, MOVE_FLASH
.byte BATTLE_FRONTIER_ITEM_SILVER_POWDER .byte BATTLE_FRONTIER_ITEM_SILVER_POWDER
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE
.4byte NATURE_MODEST .4byte NATURE_MODEST
; 3 @ 3
.2byte SPECIES_TAILLOW .2byte SPECIES_TAILLOW
.2byte MOVE_AGILITY, MOVE_DOUBLE_TEAM, MOVE_WING_ATTACK, MOVE_GROWL .2byte MOVE_AGILITY, MOVE_DOUBLE_TEAM, MOVE_WING_ATTACK, MOVE_GROWL
.byte BATTLE_FRONTIER_ITEM_ORAN_BERRY .byte BATTLE_FRONTIER_ITEM_ORAN_BERRY
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_RELAXED .4byte NATURE_RELAXED
; 4 @ 4
.2byte SPECIES_SHROOMISH .2byte SPECIES_SHROOMISH
.2byte MOVE_HEADBUTT, MOVE_STUN_SPORE, MOVE_LEECH_SEED, MOVE_FLASH .2byte MOVE_HEADBUTT, MOVE_STUN_SPORE, MOVE_LEECH_SEED, MOVE_FLASH
.byte BATTLE_FRONTIER_ITEM_LUM_BERRY .byte BATTLE_FRONTIER_ITEM_LUM_BERRY
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
.4byte NATURE_RASH .4byte NATURE_RASH
; 5 @ 5
.2byte SPECIES_MACHOP .2byte SPECIES_MACHOP
.2byte MOVE_LOW_KICK, MOVE_LEER, MOVE_FOCUS_ENERGY, MOVE_ENCORE .2byte MOVE_LOW_KICK, MOVE_LEER, MOVE_FOCUS_ENERGY, MOVE_ENCORE
.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
.4byte NATURE_LONELY .4byte NATURE_LONELY
; 6 @ 6
.2byte SPECIES_MAGIKARP .2byte SPECIES_MAGIKARP
.2byte MOVE_SPLASH, MOVE_FLAIL, MOVE_TACKLE, MOVE_NONE .2byte MOVE_SPLASH, MOVE_FLAIL, MOVE_TACKLE, MOVE_NONE
.byte BATTLE_FRONTIER_ITEM_SILK_SCARF .byte BATTLE_FRONTIER_ITEM_SILK_SCARF
.byte F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_ATTACK
.4byte NATURE_HARDY .4byte NATURE_HARDY
; 7 @ 7
.2byte SPECIES_BARBOACH .2byte SPECIES_BARBOACH
.2byte MOVE_MUD_SLAP, MOVE_WATER_GUN, MOVE_RAIN_DANCE, MOVE_SPARK .2byte MOVE_MUD_SLAP, MOVE_WATER_GUN, MOVE_RAIN_DANCE, MOVE_SPARK
.byte BATTLE_FRONTIER_ITEM_ASPEAR_BERRY .byte BATTLE_FRONTIER_ITEM_ASPEAR_BERRY
.byte F_EV_SPREAD_SPEED .byte F_EV_SPREAD_SPEED
.4byte NATURE_HASTY .4byte NATURE_HASTY
; 8 @ 8
.2byte SPECIES_WINGULL .2byte SPECIES_WINGULL
.2byte MOVE_ATTRACT, MOVE_TWISTER, MOVE_WING_ATTACK, MOVE_SUPERSONIC .2byte MOVE_ATTRACT, MOVE_TWISTER, MOVE_WING_ATTACK, MOVE_SUPERSONIC
.byte BATTLE_FRONTIER_ITEM_DRAGON_FANG .byte BATTLE_FRONTIER_ITEM_DRAGON_FANG
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
.4byte NATURE_IMPISH .4byte NATURE_IMPISH
; 9 @ 9
.2byte SPECIES_ARON .2byte SPECIES_ARON
.2byte MOVE_ENDEAVOR, MOVE_METAL_CLAW, MOVE_TACKLE, MOVE_ATTRACT .2byte MOVE_ENDEAVOR, MOVE_METAL_CLAW, MOVE_TACKLE, MOVE_ATTRACT
.byte BATTLE_FRONTIER_ITEM_PECHA_BERRY .byte BATTLE_FRONTIER_ITEM_PECHA_BERRY
.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
.4byte NATURE_HARDY .4byte NATURE_HARDY
; 10 @ 10
.2byte SPECIES_NUMEL .2byte SPECIES_NUMEL
.2byte MOVE_EMBER, MOVE_ROCK_SLIDE, MOVE_ROLLOUT, MOVE_GROWL .2byte MOVE_EMBER, MOVE_ROCK_SLIDE, MOVE_ROLLOUT, MOVE_GROWL
.byte BATTLE_FRONTIER_ITEM_CHARCOAL .byte BATTLE_FRONTIER_ITEM_CHARCOAL
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
.4byte NATURE_SASSY .4byte NATURE_SASSY
; 11 @ 11
.2byte SPECIES_SWALOT .2byte SPECIES_SWALOT
.2byte MOVE_YAWN, MOVE_SLUDGE, MOVE_ACID_ARMOR, MOVE_AMNESIA .2byte MOVE_YAWN, MOVE_SLUDGE, MOVE_ACID_ARMOR, MOVE_AMNESIA
.byte BATTLE_FRONTIER_ITEM_POISON_BARB .byte BATTLE_FRONTIER_ITEM_POISON_BARB
.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_BOLD .4byte NATURE_BOLD
; 12 @ 12
.2byte SPECIES_KECLEON .2byte SPECIES_KECLEON
.2byte MOVE_SUBSTITUTE, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_BIND .2byte MOVE_SUBSTITUTE, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_BIND
.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
.4byte NATURE_QUIET .4byte NATURE_QUIET
; 13 @ 13
.2byte SPECIES_BALTOY .2byte SPECIES_BALTOY
.2byte MOVE_SANDSTORM, MOVE_FLASH, MOVE_SELF_DESTRUCT, MOVE_HARDEN .2byte MOVE_SANDSTORM, MOVE_FLASH, MOVE_SELF_DESTRUCT, MOVE_HARDEN
.byte BATTLE_FRONTIER_ITEM_LEFTOVERS .byte BATTLE_FRONTIER_ITEM_LEFTOVERS
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
.4byte NATURE_NAUGHTY .4byte NATURE_NAUGHTY
; 14 @ 14
.2byte SPECIES_NINJASK .2byte SPECIES_NINJASK
.2byte MOVE_DIG, MOVE_SCREECH, MOVE_SWORDS_DANCE, MOVE_LEECH_LIFE .2byte MOVE_DIG, MOVE_SCREECH, MOVE_SWORDS_DANCE, MOVE_LEECH_LIFE
.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
.4byte NATURE_SASSY .4byte NATURE_SASSY
; 15 @ 15
.2byte SPECIES_MAKUHITA .2byte SPECIES_MAKUHITA
.2byte MOVE_BULK_UP, MOVE_ARM_THRUST, MOVE_SMELLING_SALT, MOVE_SAND_ATTACK .2byte MOVE_BULK_UP, MOVE_ARM_THRUST, MOVE_SMELLING_SALT, MOVE_SAND_ATTACK
.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
.4byte NATURE_NAUGHTY .4byte NATURE_NAUGHTY
; 16 @ 16
.2byte SPECIES_SWABLU .2byte SPECIES_SWABLU
.2byte MOVE_REFRESH, MOVE_SAFEGUARD, MOVE_ATTRACT, MOVE_MIRROR_MOVE .2byte MOVE_REFRESH, MOVE_SAFEGUARD, MOVE_ATTRACT, MOVE_MIRROR_MOVE
.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
.4byte NATURE_MILD .4byte NATURE_MILD
; 17 @ 17
.2byte SPECIES_GOLDEEN .2byte SPECIES_GOLDEEN
.2byte MOVE_WATERFALL, MOVE_MUD_SPORT, MOVE_SUPERSONIC, MOVE_DOUBLE_TEAM .2byte MOVE_WATERFALL, MOVE_MUD_SPORT, MOVE_SUPERSONIC, MOVE_DOUBLE_TEAM
.byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER .byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
.4byte NATURE_GENTLE .4byte NATURE_GENTLE
; 18 @ 18
.2byte SPECIES_LOTAD .2byte SPECIES_LOTAD
.2byte MOVE_GROWL, MOVE_WATER_GUN, MOVE_MEGA_DRAIN, MOVE_PROTECT .2byte MOVE_GROWL, MOVE_WATER_GUN, MOVE_MEGA_DRAIN, MOVE_PROTECT
.byte BATTLE_FRONTIER_ITEM_IAPAPA_BERRY .byte BATTLE_FRONTIER_ITEM_IAPAPA_BERRY
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
.4byte NATURE_QUIRKY .4byte NATURE_QUIRKY
; 19 @ 19
.2byte SPECIES_NUMEL .2byte SPECIES_NUMEL
.2byte MOVE_MAGNITUDE, MOVE_EMBER, MOVE_GROWL, MOVE_DEFENSE_CURL .2byte MOVE_MAGNITUDE, MOVE_EMBER, MOVE_GROWL, MOVE_DEFENSE_CURL
.byte BATTLE_FRONTIER_ITEM_CHARCOAL .byte BATTLE_FRONTIER_ITEM_CHARCOAL
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
.4byte NATURE_RELAXED .4byte NATURE_RELAXED
; 20 @ 20
.2byte SPECIES_LINOONE .2byte SPECIES_LINOONE
.2byte MOVE_HEADBUTT, MOVE_TICKLE, MOVE_PROTECT, MOVE_REST .2byte MOVE_HEADBUTT, MOVE_TICKLE, MOVE_PROTECT, MOVE_REST
.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_IMPISH .4byte NATURE_IMPISH
; 21 @ 21
.2byte SPECIES_SEVIPER .2byte SPECIES_SEVIPER
.2byte MOVE_WRAP, MOVE_GLARE, MOVE_POISON_FANG, MOVE_SWAGGER .2byte MOVE_WRAP, MOVE_GLARE, MOVE_POISON_FANG, MOVE_SWAGGER
.byte BATTLE_FRONTIER_ITEM_ASPEAR_BERRY .byte BATTLE_FRONTIER_ITEM_ASPEAR_BERRY
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_LONELY .4byte NATURE_LONELY
; 22 @ 22
.2byte SPECIES_SKARMORY .2byte SPECIES_SKARMORY
.2byte MOVE_AIR_CUTTER, MOVE_SANDSTORM, MOVE_LEER, MOVE_AGILITY .2byte MOVE_AIR_CUTTER, MOVE_SANDSTORM, MOVE_LEER, MOVE_AGILITY
.byte BATTLE_FRONTIER_ITEM_MACHO_BRACE .byte BATTLE_FRONTIER_ITEM_MACHO_BRACE
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
.4byte NATURE_BASHFUL .4byte NATURE_BASHFUL
; 23 @ 23
.2byte SPECIES_SWELLOW .2byte SPECIES_SWELLOW
.2byte MOVE_AGILITY, MOVE_WING_ATTACK, MOVE_DOUBLE_TEAM, MOVE_SUPERSONIC .2byte MOVE_AGILITY, MOVE_WING_ATTACK, MOVE_DOUBLE_TEAM, MOVE_SUPERSONIC
.byte BATTLE_FRONTIER_ITEM_SHARP_BEAK .byte BATTLE_FRONTIER_ITEM_SHARP_BEAK
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
.4byte NATURE_NAUGHTY .4byte NATURE_NAUGHTY
; 24 @ 24
.2byte SPECIES_GOLDEEN .2byte SPECIES_GOLDEEN
.2byte MOVE_PECK, MOVE_SUPERSONIC, MOVE_PSYBEAM, MOVE_RAIN_DANCE .2byte MOVE_PECK, MOVE_SUPERSONIC, MOVE_PSYBEAM, MOVE_RAIN_DANCE
.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
.4byte NATURE_GENTLE .4byte NATURE_GENTLE
; 25 @ 25
.2byte SPECIES_ELECTRIKE .2byte SPECIES_ELECTRIKE
.2byte MOVE_SHOCK_WAVE, MOVE_TACKLE, MOVE_CHARGE, MOVE_THUNDER_WAVE .2byte MOVE_SHOCK_WAVE, MOVE_TACKLE, MOVE_CHARGE, MOVE_THUNDER_WAVE
.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
.4byte NATURE_MILD .4byte NATURE_MILD
; 26 @ 26
.2byte SPECIES_NUZLEAF .2byte SPECIES_NUZLEAF
.2byte MOVE_SUNNY_DAY, MOVE_TORMENT, MOVE_FAKE_OUT, MOVE_THIEF .2byte MOVE_SUNNY_DAY, MOVE_TORMENT, MOVE_FAKE_OUT, MOVE_THIEF
.byte BATTLE_FRONTIER_ITEM_BLACK_GLASSES .byte BATTLE_FRONTIER_ITEM_BLACK_GLASSES
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
.4byte NATURE_BOLD .4byte NATURE_BOLD
; 27 @ 27
.2byte SPECIES_ARON .2byte SPECIES_ARON
.2byte MOVE_TAKE_DOWN, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_ATTRACT .2byte MOVE_TAKE_DOWN, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_ATTRACT
.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_MODEST .4byte NATURE_MODEST
; 28 @ 28
.2byte SPECIES_MIGHTYENA .2byte SPECIES_MIGHTYENA
.2byte MOVE_HOWL, MOVE_TAKE_DOWN, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK .2byte MOVE_HOWL, MOVE_TAKE_DOWN, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK
.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_QUIRKY .4byte NATURE_QUIRKY
; 29 @ 29
.2byte SPECIES_SOLROCK .2byte SPECIES_SOLROCK
.2byte MOVE_HARDEN, MOVE_FIRE_SPIN, MOVE_MIMIC, MOVE_PSYWAVE .2byte MOVE_HARDEN, MOVE_FIRE_SPIN, MOVE_MIMIC, MOVE_PSYWAVE
.byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON .byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
.4byte NATURE_ADAMANT .4byte NATURE_ADAMANT
; 30 @ 30
.2byte SPECIES_GRAVELER .2byte SPECIES_GRAVELER
.2byte MOVE_ROLLOUT, MOVE_ROCK_SMASH, MOVE_SANDSTORM, MOVE_BLOCK .2byte MOVE_ROLLOUT, MOVE_ROCK_SMASH, MOVE_SANDSTORM, MOVE_BLOCK
.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
.4byte NATURE_IMPISH .4byte NATURE_IMPISH
; 31 @ 31
.2byte SPECIES_KADABRA .2byte SPECIES_KADABRA
.2byte MOVE_ENCORE, MOVE_PSYBEAM, MOVE_DISABLE, MOVE_KINESIS .2byte MOVE_ENCORE, MOVE_PSYBEAM, MOVE_DISABLE, MOVE_KINESIS
.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
.4byte NATURE_QUIET .4byte NATURE_QUIET
; 32 @ 32
.2byte SPECIES_VOLTORB .2byte SPECIES_VOLTORB
.2byte MOVE_PROTECT, MOVE_SELF_DESTRUCT, MOVE_SPARK, MOVE_SCREECH .2byte MOVE_PROTECT, MOVE_SELF_DESTRUCT, MOVE_SPARK, MOVE_SCREECH
.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
.4byte NATURE_BASHFUL .4byte NATURE_BASHFUL
; 33 @ 33
.2byte SPECIES_MAGNEMITE .2byte SPECIES_MAGNEMITE
.2byte MOVE_METAL_SOUND, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SHOCK_WAVE .2byte MOVE_METAL_SOUND, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SHOCK_WAVE
.byte BATTLE_FRONTIER_ITEM_MAGNET .byte BATTLE_FRONTIER_ITEM_MAGNET
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_SERIOUS .4byte NATURE_SERIOUS
; 34 @ 34
.2byte SPECIES_PELIPPER .2byte SPECIES_PELIPPER
.2byte MOVE_WING_ATTACK, MOVE_MIST, MOVE_AGILITY, MOVE_PROTECT .2byte MOVE_WING_ATTACK, MOVE_MIST, MOVE_AGILITY, MOVE_PROTECT
.byte BATTLE_FRONTIER_ITEM_FIGY_BERRY .byte BATTLE_FRONTIER_ITEM_FIGY_BERRY
.byte 0 .byte 0
.4byte NATURE_BRAVE .4byte NATURE_BRAVE
; 35 @ 35
.2byte SPECIES_LOUDRED .2byte SPECIES_LOUDRED
.2byte MOVE_HOWL, MOVE_UPROAR, MOVE_REST, MOVE_SCREECH .2byte MOVE_HOWL, MOVE_UPROAR, MOVE_REST, MOVE_SCREECH
.byte BATTLE_FRONTIER_ITEM_LEFTOVERS .byte BATTLE_FRONTIER_ITEM_LEFTOVERS
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
.4byte NATURE_CALM .4byte NATURE_CALM
; 36 @ 36
.2byte SPECIES_MARILL .2byte SPECIES_MARILL
.2byte MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_TAIL_WHIP, MOVE_BUBBLE_BEAM .2byte MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_TAIL_WHIP, MOVE_BUBBLE_BEAM
.byte BATTLE_FRONTIER_ITEM_RAWST_BERRY .byte BATTLE_FRONTIER_ITEM_RAWST_BERRY
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
.4byte NATURE_JOLLY .4byte NATURE_JOLLY
; 37 @ 37
.2byte SPECIES_TRAPINCH .2byte SPECIES_TRAPINCH
.2byte MOVE_DIG, MOVE_ROCK_TOMB, MOVE_SANDSTORM, MOVE_FAINT_ATTACK .2byte MOVE_DIG, MOVE_ROCK_TOMB, MOVE_SANDSTORM, MOVE_FAINT_ATTACK
.byte BATTLE_FRONTIER_ITEM_NONE .byte BATTLE_FRONTIER_ITEM_NONE
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_NAUGHTY .4byte NATURE_NAUGHTY
; 38 @ 38
.2byte SPECIES_TENTACOOL .2byte SPECIES_TENTACOOL
.2byte MOVE_SCREECH, MOVE_CONFUSE_RAY, MOVE_WRAP, MOVE_ATTRACT .2byte MOVE_SCREECH, MOVE_CONFUSE_RAY, MOVE_WRAP, MOVE_ATTRACT
.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
.4byte NATURE_RELAXED .4byte NATURE_RELAXED
; 39 @ 39
.2byte SPECIES_VIGOROTH .2byte SPECIES_VIGOROTH
.2byte MOVE_ENCORE, MOVE_SLACK_OFF, MOVE_YAWN, MOVE_SECRET_POWER .2byte MOVE_ENCORE, MOVE_SLACK_OFF, MOVE_YAWN, MOVE_SECRET_POWER
.byte BATTLE_FRONTIER_ITEM_MENTAL_HERB .byte BATTLE_FRONTIER_ITEM_MENTAL_HERB
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
.4byte NATURE_QUIRKY .4byte NATURE_QUIRKY
; 40 @ 40
.2byte SPECIES_WAILMER .2byte SPECIES_WAILMER
.2byte MOVE_WATER_PULSE, MOVE_ROLLOUT, MOVE_CURSE, MOVE_PROTECT .2byte MOVE_WATER_PULSE, MOVE_ROLLOUT, MOVE_CURSE, MOVE_PROTECT
.byte BATTLE_FRONTIER_ITEM_WHITE_HERB .byte BATTLE_FRONTIER_ITEM_WHITE_HERB
.byte F_EV_SPREAD_HP .byte F_EV_SPREAD_HP
.4byte NATURE_RELAXED .4byte NATURE_RELAXED
; 41 @ 41
.2byte SPECIES_ILLUMISE .2byte SPECIES_ILLUMISE
.2byte MOVE_TACKLE, MOVE_SWEET_SCENT, MOVE_WISH, MOVE_ENCORE .2byte MOVE_TACKLE, MOVE_SWEET_SCENT, MOVE_WISH, MOVE_ENCORE
.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
.4byte NATURE_QUIRKY .4byte NATURE_QUIRKY
; 42 @ 42
.2byte SPECIES_MACHOKE .2byte SPECIES_MACHOKE
.2byte MOVE_LEER, MOVE_KARATE_CHOP, MOVE_BULK_UP, MOVE_REST .2byte MOVE_LEER, MOVE_KARATE_CHOP, MOVE_BULK_UP, MOVE_REST
.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
.4byte NATURE_CALM .4byte NATURE_CALM
; 43 @ 43
.2byte SPECIES_WHISMUR .2byte SPECIES_WHISMUR
.2byte MOVE_SECRET_POWER, MOVE_SUPERSONIC, MOVE_STOMP, MOVE_ROAR .2byte MOVE_SECRET_POWER, MOVE_SUPERSONIC, MOVE_STOMP, MOVE_ROAR
.byte BATTLE_FRONTIER_ITEM_RAWST_BERRY .byte BATTLE_FRONTIER_ITEM_RAWST_BERRY
.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
.4byte NATURE_QUIRKY .4byte NATURE_QUIRKY
; 44 @ 44
.2byte SPECIES_CACNEA .2byte SPECIES_CACNEA
.2byte MOVE_INGRAIN, MOVE_LEECH_SEED, MOVE_NEEDLE_ARM, MOVE_GROWTH .2byte MOVE_INGRAIN, MOVE_LEECH_SEED, MOVE_NEEDLE_ARM, MOVE_GROWTH
.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
data/battle_frontier/verdanturf_battle_tent_trainer_mons.s
+30 -30
View File
@@ -1,6 +1,6 @@
.align 1, 0 .align 1, 0
gVerdanturfBattleTentTrainerMons_Brenna: ; 85DE48C gVerdanturfBattleTentTrainerMons_Brenna: @ 85DE48C
.2byte 4 .2byte 4
.2byte 11 .2byte 11
.2byte 13 .2byte 13
@@ -8,7 +8,7 @@ gVerdanturfBattleTentTrainerMons_Brenna: ; 85DE48C
.2byte 26 .2byte 26
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Dilan: ; 85DE498 gVerdanturfBattleTentTrainerMons_Dilan: @ 85DE498
.2byte 30 .2byte 30
.2byte 37 .2byte 37
.2byte 13 .2byte 13
@@ -16,7 +16,7 @@ gVerdanturfBattleTentTrainerMons_Dilan: ; 85DE498
.2byte 42 .2byte 42
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Eliana: ; 85DE4A4 gVerdanturfBattleTentTrainerMons_Eliana: @ 85DE4A4
.2byte 6 .2byte 6
.2byte 7 .2byte 7
.2byte 17 .2byte 17
@@ -24,7 +24,7 @@ gVerdanturfBattleTentTrainerMons_Eliana: ; 85DE4A4
.2byte 40 .2byte 40
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Markus: ; 85DE4B0 gVerdanturfBattleTentTrainerMons_Markus: @ 85DE4B0
.2byte 6 .2byte 6
.2byte 7 .2byte 7
.2byte 18 .2byte 18
@@ -32,7 +32,7 @@ gVerdanturfBattleTentTrainerMons_Markus: ; 85DE4B0
.2byte 38 .2byte 38
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Caitlyn: ; 85DE4BC gVerdanturfBattleTentTrainerMons_Caitlyn: @ 85DE4BC
.2byte 0 .2byte 0
.2byte 12 .2byte 12
.2byte 25 .2byte 25
@@ -41,7 +41,7 @@ gVerdanturfBattleTentTrainerMons_Caitlyn: ; 85DE4BC
.2byte 44 .2byte 44
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Desiree: ; 85DE4CA gVerdanturfBattleTentTrainerMons_Desiree: @ 85DE4CA
.2byte 8 .2byte 8
.2byte 12 .2byte 12
.2byte 21 .2byte 21
@@ -49,7 +49,7 @@ gVerdanturfBattleTentTrainerMons_Desiree: ; 85DE4CA
.2byte 31 .2byte 31
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Ronald: ; 85DE4D6 gVerdanturfBattleTentTrainerMons_Ronald: @ 85DE4D6
.2byte 1 .2byte 1
.2byte 20 .2byte 20
.2byte 23 .2byte 23
@@ -57,7 +57,7 @@ gVerdanturfBattleTentTrainerMons_Ronald: ; 85DE4D6
.2byte 32 .2byte 32
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Ashten: ; 85DE4E2 gVerdanturfBattleTentTrainerMons_Ashten: @ 85DE4E2
.2byte 9 .2byte 9
.2byte 12 .2byte 12
.2byte 27 .2byte 27
@@ -65,7 +65,7 @@ gVerdanturfBattleTentTrainerMons_Ashten: ; 85DE4E2
.2byte 43 .2byte 43
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Gerard: ; 85DE4EE gVerdanturfBattleTentTrainerMons_Gerard: @ 85DE4EE
.2byte 36 .2byte 36
.2byte 7 .2byte 7
.2byte 34 .2byte 34
@@ -73,7 +73,7 @@ gVerdanturfBattleTentTrainerMons_Gerard: ; 85DE4EE
.2byte 40 .2byte 40
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Bradly: ; 85DE4FA gVerdanturfBattleTentTrainerMons_Bradly: @ 85DE4FA
.2byte 26 .2byte 26
.2byte 3 .2byte 3
.2byte 0 .2byte 0
@@ -81,7 +81,7 @@ gVerdanturfBattleTentTrainerMons_Bradly: ; 85DE4FA
.2byte 17 .2byte 17
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Dennis: ; 85DE506 gVerdanturfBattleTentTrainerMons_Dennis: @ 85DE506
.2byte 14 .2byte 14
.2byte 37 .2byte 37
.2byte 2 .2byte 2
@@ -89,7 +89,7 @@ gVerdanturfBattleTentTrainerMons_Dennis: ; 85DE506
.2byte 27 .2byte 27
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Prestin: ; 85DE512 gVerdanturfBattleTentTrainerMons_Prestin: @ 85DE512
.2byte 31 .2byte 31
.2byte 28 .2byte 28
.2byte 22 .2byte 22
@@ -99,7 +99,7 @@ gVerdanturfBattleTentTrainerMons_Prestin: ; 85DE512
.2byte 41 .2byte 41
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Ernesto: ; 85DE522 gVerdanturfBattleTentTrainerMons_Ernesto: @ 85DE522
.2byte 33 .2byte 33
.2byte 32 .2byte 32
.2byte 25 .2byte 25
@@ -107,7 +107,7 @@ gVerdanturfBattleTentTrainerMons_Ernesto: ; 85DE522
.2byte 34 .2byte 34
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Nala: ; 85DE52E gVerdanturfBattleTentTrainerMons_Nala: @ 85DE52E
.2byte 1 .2byte 1
.2byte 4 .2byte 4
.2byte 8 .2byte 8
@@ -117,7 +117,7 @@ gVerdanturfBattleTentTrainerMons_Nala: ; 85DE52E
.2byte 34 .2byte 34
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Darnell: ; 85DE53E gVerdanturfBattleTentTrainerMons_Darnell: @ 85DE53E
.2byte 0 .2byte 0
.2byte 29 .2byte 29
.2byte 35 .2byte 35
@@ -126,7 +126,7 @@ gVerdanturfBattleTentTrainerMons_Darnell: ; 85DE53E
.2byte 43 .2byte 43
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Ashlyn: ; 85DE54C gVerdanturfBattleTentTrainerMons_Ashlyn: @ 85DE54C
.2byte 29 .2byte 29
.2byte 36 .2byte 36
.2byte 32 .2byte 32
@@ -136,7 +136,7 @@ gVerdanturfBattleTentTrainerMons_Ashlyn: ; 85DE54C
.2byte 44 .2byte 44
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Addison: ; 85DE55C gVerdanturfBattleTentTrainerMons_Addison: @ 85DE55C
.2byte 0 .2byte 0
.2byte 1 .2byte 1
.2byte 16 .2byte 16
@@ -144,7 +144,7 @@ gVerdanturfBattleTentTrainerMons_Addison: ; 85DE55C
.2byte 6 .2byte 6
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Justine: ; 85DE568 gVerdanturfBattleTentTrainerMons_Justine: @ 85DE568
.2byte 0 .2byte 0
.2byte 1 .2byte 1
.2byte 16 .2byte 16
@@ -152,7 +152,7 @@ gVerdanturfBattleTentTrainerMons_Justine: ; 85DE568
.2byte 18 .2byte 18
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Tyson: ; 85DE574 gVerdanturfBattleTentTrainerMons_Tyson: @ 85DE574
.2byte 5 .2byte 5
.2byte 15 .2byte 15
.2byte 22 .2byte 22
@@ -162,7 +162,7 @@ gVerdanturfBattleTentTrainerMons_Tyson: ; 85DE574
.2byte 43 .2byte 43
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Laila: ; 85DE584 gVerdanturfBattleTentTrainerMons_Laila: @ 85DE584
.2byte 5 .2byte 5
.2byte 15 .2byte 15
.2byte 19 .2byte 19
@@ -171,7 +171,7 @@ gVerdanturfBattleTentTrainerMons_Laila: ; 85DE584
.2byte 43 .2byte 43
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Waren: ; 85DE592 gVerdanturfBattleTentTrainerMons_Waren: @ 85DE592
.2byte 0 .2byte 0
.2byte 9 .2byte 9
.2byte 10 .2byte 10
@@ -179,7 +179,7 @@ gVerdanturfBattleTentTrainerMons_Waren: ; 85DE592
.2byte 23 .2byte 23
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Tobias: ; 85DE59E gVerdanturfBattleTentTrainerMons_Tobias: @ 85DE59E
.2byte 6 .2byte 6
.2byte 7 .2byte 7
.2byte 24 .2byte 24
@@ -187,7 +187,7 @@ gVerdanturfBattleTentTrainerMons_Tobias: ; 85DE59E
.2byte 40 .2byte 40
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Josiah: ; 85DE5AA gVerdanturfBattleTentTrainerMons_Josiah: @ 85DE5AA
.2byte 8 .2byte 8
.2byte 16 .2byte 16
.2byte 23 .2byte 23
@@ -195,7 +195,7 @@ gVerdanturfBattleTentTrainerMons_Josiah: ; 85DE5AA
.2byte 3 .2byte 3
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Dion: ; 85DE5B6 gVerdanturfBattleTentTrainerMons_Dion: @ 85DE5B6
.2byte 14 .2byte 14
.2byte 2 .2byte 2
.2byte 11 .2byte 11
@@ -204,7 +204,7 @@ gVerdanturfBattleTentTrainerMons_Dion: ; 85DE5B6
.2byte 38 .2byte 38
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Kenzie: ; 85DE5C4 gVerdanturfBattleTentTrainerMons_Kenzie: @ 85DE5C4
.2byte 18 .2byte 18
.2byte 10 .2byte 10
.2byte 16 .2byte 16
@@ -213,7 +213,7 @@ gVerdanturfBattleTentTrainerMons_Kenzie: ; 85DE5C4
.2byte 27 .2byte 27
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Lillian: ; 85DE5D2 gVerdanturfBattleTentTrainerMons_Lillian: @ 85DE5D2
.2byte 24 .2byte 24
.2byte 34 .2byte 34
.2byte 36 .2byte 36
@@ -221,7 +221,7 @@ gVerdanturfBattleTentTrainerMons_Lillian: ; 85DE5D2
.2byte 5 .2byte 5
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Lesley: ; 85DE5DE gVerdanturfBattleTentTrainerMons_Lesley: @ 85DE5DE
.2byte 26 .2byte 26
.2byte 0 .2byte 0
.2byte 18 .2byte 18
@@ -229,7 +229,7 @@ gVerdanturfBattleTentTrainerMons_Lesley: ; 85DE5DE
.2byte 25 .2byte 25
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Marquis: ; 85DE5EA gVerdanturfBattleTentTrainerMons_Marquis: @ 85DE5EA
.2byte 24 .2byte 24
.2byte 34 .2byte 34
.2byte 5 .2byte 5
@@ -238,7 +238,7 @@ gVerdanturfBattleTentTrainerMons_Marquis: ; 85DE5EA
.2byte 42 .2byte 42
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Freddy: ; 85DE5F8 gVerdanturfBattleTentTrainerMons_Freddy: @ 85DE5F8
.2byte 18 .2byte 18
.2byte 21 .2byte 21
.2byte 26 .2byte 26
@@ -246,7 +246,7 @@ gVerdanturfBattleTentTrainerMons_Freddy: ; 85DE5F8
.2byte 41 .2byte 41
.2byte -1 .2byte -1
gVerdanturfBattleTentTrainerMons_Cecilia: ; 85DE604 gVerdanturfBattleTentTrainerMons_Cecilia: @ 85DE604
.2byte 23 .2byte 23
.2byte 26 .2byte 26
.2byte 27 .2byte 27
data/battle_frontier/verdanturf_battle_tent_trainers.s
+121 -121
View File
@@ -1,24 +1,24 @@
.align 2, 0 .align 2, 0
gVerdanturfBattleTentTrainers: ; 85DE610 gVerdanturfBattleTentTrainers: @ 85DE610
; 0 @ 0
.4byte TRAINER_CLASS_AROMA_LADY .4byte TRAINER_CLASS_AROMA_LADY
.charmapstr "BRENNA$", 8 .charmapstr "BRENNA$", 8
; pre-battle speech @ pre-battle speech
ec_word NO ec_word NO
ec_word DAYS ec_word DAYS
ec_word GO ec_word GO
ec_word WITHOUT ec_word WITHOUT
ec_word MY ec_word MY
ec_move1 FAKE_TEARS ec_move1 FAKE_TEARS
; win speech @ win speech
ec_word OH ec_word OH
ec_word THAT_WAS ec_word THAT_WAS
ec_word SO ec_word SO
ec_word REFRESHING ec_word REFRESHING
ec_word EXCL ec_word EXCL
.2byte -1 .2byte -1
; loss speech @ loss speech
ec_word ALL ec_word ALL
ec_word I ec_word I
ec_word EVER ec_word EVER
@@ -27,24 +27,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_move1 TORMENT ec_move1 TORMENT
.4byte gVerdanturfBattleTentTrainerMons_Brenna .4byte gVerdanturfBattleTentTrainerMons_Brenna
; 1 @ 1
.4byte TRAINER_CLASS_RUIN_MANIAC .4byte TRAINER_CLASS_RUIN_MANIAC
.charmapstr "DILAN$", 8 .charmapstr "DILAN$", 8
; pre-battle speech @ pre-battle speech
ec_word YOU ec_word YOU
ec_word DON_T ec_word DON_T
ec_word KNOW ec_word KNOW
ec_word HOW ec_word HOW
ec_word BORED ec_word BORED
ec_word I_AM ec_word I_AM
; win speech @ win speech
ec_word LOSING ec_word LOSING
ec_word ISN_T ec_word ISN_T
ec_word EXCITING ec_word EXCITING
ec_word AT ec_word AT
ec_word ALL ec_word ALL
ec_word ELLIPSIS ec_word ELLIPSIS
; loss speech @ loss speech
ec_word EXCITING ec_word EXCITING
ec_word EXCL_EXCL ec_word EXCL_EXCL
ec_word BYE_BYE ec_word BYE_BYE
@@ -53,24 +53,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word BORED ec_word BORED
.4byte gVerdanturfBattleTentTrainerMons_Dilan .4byte gVerdanturfBattleTentTrainerMons_Dilan
; 2 @ 2
.4byte TRAINER_CLASS_TUBER_1 .4byte TRAINER_CLASS_TUBER_1
.charmapstr "ELIANA$", 8 .charmapstr "ELIANA$", 8
; pre-battle speech @ pre-battle speech
ec_word I_AM ec_word I_AM
ec_word GOING ec_word GOING
ec_word ON ec_word ON
ec_word A ec_word A
ec_word VACATION ec_word VACATION
ec_word SOON ec_word SOON
; win speech @ win speech
ec_word I ec_word I
ec_word NEED ec_word NEED
ec_word TO ec_word TO
ec_word GET ec_word GET
ec_word SOME ec_word SOME
ec_word MONEY ec_word MONEY
; loss speech @ loss speech
ec_word NO ec_word NO
ec_word SLEEP ec_word SLEEP
ec_word UNTIL ec_word UNTIL
@@ -79,24 +79,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word HOME ec_word HOME
.4byte gVerdanturfBattleTentTrainerMons_Eliana .4byte gVerdanturfBattleTentTrainerMons_Eliana
; 3 @ 3
.4byte TRAINER_CLASS_TUBER_2 .4byte TRAINER_CLASS_TUBER_2
.charmapstr "MARKUS$", 8 .charmapstr "MARKUS$", 8
; pre-battle speech @ pre-battle speech
ec_word I_AM ec_word I_AM
ec_word SMART ec_word SMART
ec_word EXCL ec_word EXCL
ec_word IF_I_LOSE ec_word IF_I_LOSE
ec_word I ec_word I
ec_move1 SELF_DESTRUCT ec_move1 SELF_DESTRUCT
; win speech @ win speech
ec_word IT_S ec_word IT_S
ec_word A ec_word A
ec_word NON_STOP ec_word NON_STOP
ec_move2 EXPLOSION ec_move2 EXPLOSION
ec_word OF ec_word OF
ec_word JOY ec_word JOY
; loss speech @ loss speech
ec_word I_VE ec_word I_VE
ec_word LOST ec_word LOST
ec_word ELLIPSIS ec_word ELLIPSIS
@@ -105,24 +105,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_move1 SELF_DESTRUCT ec_move1 SELF_DESTRUCT
.4byte gVerdanturfBattleTentTrainerMons_Markus .4byte gVerdanturfBattleTentTrainerMons_Markus
; 4 @ 4
.4byte TRAINER_CLASS_LADY .4byte TRAINER_CLASS_LADY
.charmapstr "CAITLYN$", 8 .charmapstr "CAITLYN$", 8
; pre-battle speech @ pre-battle speech
ec_word I_AM ec_word I_AM
ec_word BORED ec_word BORED
ec_word OF ec_word OF
ec_word BEING ec_word BEING
ec_word AN ec_word AN
ec_word IDOL ec_word IDOL
; win speech @ win speech
ec_word A ec_word A
ec_word BATTLE ec_word BATTLE
ec_word IS ec_word IS
ec_word BEST ec_word BEST
ec_word FOR ec_word FOR
ec_word HAPPINESS ec_word HAPPINESS
; loss speech @ loss speech
ec_word LOSING ec_word LOSING
ec_word DOESN_T ec_word DOESN_T
ec_word BUG ec_word BUG
@@ -131,24 +131,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word ALL ec_word ALL
.4byte gVerdanturfBattleTentTrainerMons_Caitlyn .4byte gVerdanturfBattleTentTrainerMons_Caitlyn
; 5 @ 5
.4byte TRAINER_CLASS_BEAUTY .4byte TRAINER_CLASS_BEAUTY
.charmapstr "DESIREE$", 8 .charmapstr "DESIREE$", 8
; pre-battle speech @ pre-battle speech
ec_word DOESN_T ec_word DOESN_T
ec_word MY ec_word MY
ec_word BEAUTY ec_word BEAUTY
ec_move1 ASTONISH ec_move1 ASTONISH
ec_word YOU ec_word YOU
ec_word QUES ec_word QUES
; win speech @ win speech
ec_word DID ec_word DID
ec_word I ec_word I
ec_word INTIMIDATE ec_word INTIMIDATE
ec_word YOU ec_word YOU
ec_word QUES ec_word QUES
.2byte -1 .2byte -1
; loss speech @ loss speech
ec_word MY ec_word MY
ec_word BEAUTY ec_word BEAUTY
ec_word DID ec_word DID
@@ -157,24 +157,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word YOU ec_word YOU
.4byte gVerdanturfBattleTentTrainerMons_Desiree .4byte gVerdanturfBattleTentTrainerMons_Desiree
; 6 @ 6
.4byte TRAINER_CLASS_RICH_BOY .4byte TRAINER_CLASS_RICH_BOY
.charmapstr "RONALD$", 8 .charmapstr "RONALD$", 8
; pre-battle speech @ pre-battle speech
ec_word COME_ON ec_word COME_ON
ec_word I ec_word I
ec_word WILL ec_word WILL
ec_word BATTLE ec_word BATTLE
ec_word SERIOUSLY ec_word SERIOUSLY
.2byte -1 .2byte -1
; win speech @ win speech
ec_word GIVE_UP ec_word GIVE_UP
ec_word QUES ec_word QUES
.2byte -1 .2byte -1
ec_word THAT_S ec_word THAT_S
ec_word REALLY ec_word REALLY
ec_word WEAK ec_word WEAK
; loss speech @ loss speech
ec_word I ec_word I
ec_word NEED ec_word NEED
ec_word TO ec_word TO
@@ -183,24 +183,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_move2 BATON_PASS ec_move2 BATON_PASS
.4byte gVerdanturfBattleTentTrainerMons_Ronald .4byte gVerdanturfBattleTentTrainerMons_Ronald
; 7 @ 7
.4byte TRAINER_CLASS_POKEMANIAC .4byte TRAINER_CLASS_POKEMANIAC
.charmapstr "ASHTEN$", 8 .charmapstr "ASHTEN$", 8
; pre-battle speech @ pre-battle speech
ec_word OH_YEAH ec_word OH_YEAH
ec_word ANOTHER ec_word ANOTHER
ec_word EXCITING ec_word EXCITING
ec_word BATTLE ec_word BATTLE
ec_word EXCL ec_word EXCL
.2byte -1 .2byte -1
; win speech @ win speech
ec_word YOUR ec_word YOUR
ec_word POKEMON ec_word POKEMON
ec_word ARE ec_word ARE
ec_word WIMPY ec_word WIMPY
ec_word AND ec_word AND
ec_word BORING ec_word BORING
; loss speech @ loss speech
ec_word THAT_WAS ec_word THAT_WAS
ec_word AN ec_word AN
ec_word EXCITING ec_word EXCITING
@@ -209,24 +209,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word EXCL ec_word EXCL
.4byte gVerdanturfBattleTentTrainerMons_Ashten .4byte gVerdanturfBattleTentTrainerMons_Ashten
; 8 @ 8
.4byte TRAINER_CLASS_SWIMMER_M .4byte TRAINER_CLASS_SWIMMER_M
.charmapstr "GERARD$", 8 .charmapstr "GERARD$", 8
; pre-battle speech @ pre-battle speech
ec_word LOOK ec_word LOOK
ec_word AT ec_word AT
ec_word MY ec_word MY
ec_word SUPER ec_word SUPER
ec_move2 TEETER_DANCE ec_move2 TEETER_DANCE
ec_word EXCL ec_word EXCL
; win speech @ win speech
ec_word THAT_WAS ec_word THAT_WAS
ec_word HARD ec_word HARD
ec_word ELLIPSIS ec_word ELLIPSIS
ec_word AM ec_word AM
ec_word I ec_word I
ec_word OK_QUES ec_word OK_QUES
; loss speech @ loss speech
ec_word I ec_word I
ec_word WON_T ec_word WON_T
ec_word FORGIVE ec_word FORGIVE
@@ -235,24 +235,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word THAT ec_word THAT
.4byte gVerdanturfBattleTentTrainerMons_Gerard .4byte gVerdanturfBattleTentTrainerMons_Gerard
; 9 @ 9
.4byte TRAINER_CLASS_CAMPER .4byte TRAINER_CLASS_CAMPER
.charmapstr "BRADLY$", 8 .charmapstr "BRADLY$", 8
; pre-battle speech @ pre-battle speech
ec_word IT_S ec_word IT_S
ec_word LONESOME ec_word LONESOME
ec_word BUT ec_word BUT
ec_word I ec_word I
ec_word VACATION ec_word VACATION
ec_word ALONE ec_word ALONE
; win speech @ win speech
ec_word I ec_word I
ec_word WILL ec_word WILL
ec_move1 WITHDRAW ec_move1 WITHDRAW
ec_word INSIDE ec_word INSIDE
ec_word MY ec_word MY
ec_word SHELL_ARMOR ec_word SHELL_ARMOR
; loss speech @ loss speech
ec_word OH ec_word OH
ec_word ELLIPSIS ec_word ELLIPSIS
.2byte -1 .2byte -1
@@ -261,24 +261,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word ALWAYS ec_word ALWAYS
.4byte gVerdanturfBattleTentTrainerMons_Bradly .4byte gVerdanturfBattleTentTrainerMons_Bradly
; 10 @ 10
.4byte TRAINER_CLASS_BUG_MANIAC .4byte TRAINER_CLASS_BUG_MANIAC
.charmapstr "DENNIS$", 8 .charmapstr "DENNIS$", 8
; pre-battle speech @ pre-battle speech
ec_word ARE ec_word ARE
ec_word YOU ec_word YOU
ec_word REALLY ec_word REALLY
ec_word STRONG ec_word STRONG
ec_word QUES ec_word QUES
.2byte -1 .2byte -1
; win speech @ win speech
ec_word WAHAHAHA ec_word WAHAHAHA
ec_word EXCL ec_word EXCL
.2byte -1 .2byte -1
ec_word WAHAHAHA ec_word WAHAHAHA
ec_word EXCL_EXCL ec_word EXCL_EXCL
.2byte -1 .2byte -1
; loss speech @ loss speech
ec_word NICE ec_word NICE
ec_word GOING ec_word GOING
ec_word EXCL ec_word EXCL
@@ -287,24 +287,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word CHILD_S_PLAY ec_word CHILD_S_PLAY
.4byte gVerdanturfBattleTentTrainerMons_Dennis .4byte gVerdanturfBattleTentTrainerMons_Dennis
; 11 @ 11
.4byte TRAINER_CLASS_GENTLEMAN .4byte TRAINER_CLASS_GENTLEMAN
.charmapstr "PRESTIN$", 8 .charmapstr "PRESTIN$", 8
; pre-battle speech @ pre-battle speech
ec_word THIS ec_word THIS
ec_word IS ec_word IS
ec_word A ec_word A
ec_move1 NIGHTMARE ec_move1 NIGHTMARE
ec_word FOR ec_word FOR
ec_word YOU ec_word YOU
; win speech @ win speech
ec_word FORGIVE ec_word FORGIVE
ec_word ME ec_word ME
ec_word ELLIPSIS ec_word ELLIPSIS
ec_word IT_S ec_word IT_S
ec_word A ec_word A
ec_word DREAM ec_word DREAM
; loss speech @ loss speech
ec_word I ec_word I
ec_word WANT ec_word WANT
ec_word TO ec_word TO
@@ -313,24 +313,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word THIS ec_word THIS
.4byte gVerdanturfBattleTentTrainerMons_Prestin .4byte gVerdanturfBattleTentTrainerMons_Prestin
; 12 @ 12
.4byte TRAINER_CLASS_GUITARIST .4byte TRAINER_CLASS_GUITARIST
.charmapstr "ERNESTO$", 8 .charmapstr "ERNESTO$", 8
; pre-battle speech @ pre-battle speech
ec_word THIS ec_word THIS
ec_word PARTY ec_word PARTY
ec_word GOES ec_word GOES
ec_word ON ec_word ON
ec_word FOREVER ec_word FOREVER
ec_word EXCL ec_word EXCL
; win speech @ win speech
ec_word THE ec_word THE
ec_word MUSIC ec_word MUSIC
ec_word PLAYS ec_word PLAYS
ec_word ON ec_word ON
ec_word WITHOUT ec_word WITHOUT
ec_word END ec_word END
; loss speech @ loss speech
ec_word NO ec_word NO
ec_word EXCL ec_word EXCL
ec_word THE ec_word THE
@@ -339,24 +339,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word STOP ec_word STOP
.4byte gVerdanturfBattleTentTrainerMons_Ernesto .4byte gVerdanturfBattleTentTrainerMons_Ernesto
; 13 @ 13
.4byte TRAINER_CLASS_SCHOOL_KID_2 .4byte TRAINER_CLASS_SCHOOL_KID_2
.charmapstr "NALA$", 8 .charmapstr "NALA$", 8
; pre-battle speech @ pre-battle speech
ec_word I ec_word I
ec_word WANT ec_word WANT
ec_word THE ec_word THE
ec_word WORLD ec_word WORLD
ec_word MOVIE ec_word MOVIE
ec_word COLLECTION ec_word COLLECTION
; win speech @ win speech
ec_word I ec_word I
ec_word DON_T ec_word DON_T
ec_word LIKE ec_word LIKE
ec_word RADIO ec_word RADIO
ec_word VERY ec_word VERY
ec_word MUCH ec_word MUCH
; loss speech @ loss speech
ec_word I ec_word I
ec_word REFUSE ec_word REFUSE
ec_word TO ec_word TO
@@ -365,24 +365,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word EXCL ec_word EXCL
.4byte gVerdanturfBattleTentTrainerMons_Nala .4byte gVerdanturfBattleTentTrainerMons_Nala
; 14 @ 14
.4byte TRAINER_CLASS_COOLTRAINER_1 .4byte TRAINER_CLASS_COOLTRAINER_1
.charmapstr "DARNELL$", 8 .charmapstr "DARNELL$", 8
; pre-battle speech @ pre-battle speech
ec_word I ec_word I
ec_word WILL ec_word WILL
ec_word GO_EASY ec_word GO_EASY
ec_word ON ec_word ON
ec_word YOU ec_word YOU
.2byte -1 .2byte -1
; win speech @ win speech
ec_word YOUR ec_word YOUR
ec_move2 FRUSTRATION ec_move2 FRUSTRATION
ec_word SHOULD ec_word SHOULD
ec_word BE ec_word BE
ec_word HIDDEN ec_word HIDDEN
ec_word AWAY ec_word AWAY
; loss speech @ loss speech
ec_word YOU_RE ec_word YOU_RE
ec_word TOO ec_word TOO
ec_word MUCH ec_word MUCH
@@ -391,24 +391,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word ELLIPSIS ec_word ELLIPSIS
.4byte gVerdanturfBattleTentTrainerMons_Darnell .4byte gVerdanturfBattleTentTrainerMons_Darnell
; 15 @ 15
.4byte TRAINER_CLASS_COOLTRAINER_2 .4byte TRAINER_CLASS_COOLTRAINER_2
.charmapstr "ASHLYN$", 8 .charmapstr "ASHLYN$", 8
; pre-battle speech @ pre-battle speech
ec_word I ec_word I
ec_word LOOK ec_word LOOK
ec_word TOUGH ec_word TOUGH
ec_word DO ec_word DO
ec_word I ec_word I
ec_word QUES ec_word QUES
; win speech @ win speech
ec_word I_AM ec_word I_AM
ec_word NOT ec_word NOT
ec_word OVER ec_word OVER
ec_word YOUR ec_word YOUR
ec_move2 TAUNT ec_move2 TAUNT
ec_word YET ec_word YET
; loss speech @ loss speech
ec_word YOU_RE ec_word YOU_RE
ec_word MEAN ec_word MEAN
ec_word EXCL_EXCL ec_word EXCL_EXCL
@@ -417,24 +417,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
.2byte -1 .2byte -1
.4byte gVerdanturfBattleTentTrainerMons_Ashlyn .4byte gVerdanturfBattleTentTrainerMons_Ashlyn
; 16 @ 16
.4byte TRAINER_CLASS_POKEFAN_1 .4byte TRAINER_CLASS_POKEFAN_1
.charmapstr "ADDISON$", 8 .charmapstr "ADDISON$", 8
; pre-battle speech @ pre-battle speech
ec_word YES ec_word YES
ec_word EXCL ec_word EXCL
.2byte -1 .2byte -1
ec_word MY ec_word MY
ec_word POKEMON ec_word POKEMON
ec_word EXCL ec_word EXCL
; win speech @ win speech
ec_word WELL ec_word WELL
ec_word WASN_T ec_word WASN_T
ec_word THAT ec_word THAT
ec_word EASY ec_word EASY
ec_word QUES ec_word QUES
.2byte -1 .2byte -1
; loss speech @ loss speech
ec_word WAAAH ec_word WAAAH
ec_word EXCL ec_word EXCL
.2byte -1 .2byte -1
@@ -443,24 +443,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word QUES ec_word QUES
.4byte gVerdanturfBattleTentTrainerMons_Addison .4byte gVerdanturfBattleTentTrainerMons_Addison
; 17 @ 17
.4byte TRAINER_CLASS_POKEFAN_2 .4byte TRAINER_CLASS_POKEFAN_2
.charmapstr "JUSTINE$", 8 .charmapstr "JUSTINE$", 8
; pre-battle speech @ pre-battle speech
ec_word YES ec_word YES
ec_word EXCL ec_word EXCL
.2byte -1 .2byte -1
ec_word COME_ON ec_word COME_ON
ec_word I_AM ec_word I_AM
ec_word READY ec_word READY
; win speech @ win speech
ec_word YOU_RE ec_word YOU_RE
ec_word JUST ec_word JUST
ec_word NOT ec_word NOT
ec_word GOOD ec_word GOOD
ec_word ENOUGH ec_word ENOUGH
ec_word EXCL ec_word EXCL
; loss speech @ loss speech
ec_word WOWEE ec_word WOWEE
ec_word EXCL_EXCL ec_word EXCL_EXCL
.2byte -1 .2byte -1
@@ -469,24 +469,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
.2byte -1 .2byte -1
.4byte gVerdanturfBattleTentTrainerMons_Justine .4byte gVerdanturfBattleTentTrainerMons_Justine
; 18 @ 18
.4byte TRAINER_CLASS_EXPERT_1 .4byte TRAINER_CLASS_EXPERT_1
.charmapstr "TYSON$", 8 .charmapstr "TYSON$", 8
; pre-battle speech @ pre-battle speech
ec_word YOU_RE ec_word YOU_RE
ec_word GOING ec_word GOING
ec_word TO ec_word TO
ec_word PRESSURE ec_word PRESSURE
ec_word ME ec_word ME
ec_word QUES ec_word QUES
; win speech @ win speech
ec_word WHAT ec_word WHAT
ec_word QUES ec_word QUES
ec_word YOU_RE ec_word YOU_RE
ec_word MUCH ec_word MUCH
ec_word TOO_WEAK ec_word TOO_WEAK
ec_word EXCL ec_word EXCL
; loss speech @ loss speech
ec_word THIS ec_word THIS
ec_word DOESN_T ec_word DOESN_T
ec_word MAKE ec_word MAKE
@@ -495,24 +495,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word EXCL ec_word EXCL
.4byte gVerdanturfBattleTentTrainerMons_Tyson .4byte gVerdanturfBattleTentTrainerMons_Tyson
; 19 @ 19
.4byte TRAINER_CLASS_EXPERT_2 .4byte TRAINER_CLASS_EXPERT_2
.charmapstr "LAILA$", 8 .charmapstr "LAILA$", 8
; pre-battle speech @ pre-battle speech
ec_word A ec_word A
ec_move2 STRUGGLE ec_move2 STRUGGLE
ec_word ISN_T ec_word ISN_T
ec_word VERY ec_word VERY
ec_word COOL ec_word COOL
.2byte -1 .2byte -1
; win speech @ win speech
ec_word NOPE ec_word NOPE
ec_word NOT_VERY ec_word NOT_VERY
ec_word COOL ec_word COOL
ec_word AT ec_word AT
ec_word ALL ec_word ALL
ec_word EXCL ec_word EXCL
; loss speech @ loss speech
ec_word YOU_RE ec_word YOU_RE
ec_word NOT ec_word NOT
ec_word COOL ec_word COOL
@@ -521,24 +521,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word WON ec_word WON
.4byte gVerdanturfBattleTentTrainerMons_Laila .4byte gVerdanturfBattleTentTrainerMons_Laila
; 20 @ 20
.4byte TRAINER_CLASS_YOUNGSTER .4byte TRAINER_CLASS_YOUNGSTER
.charmapstr "WAREN$", 8 .charmapstr "WAREN$", 8
; pre-battle speech @ pre-battle speech
ec_word DANGER ec_word DANGER
ec_word EXCL ec_word EXCL
.2byte -1 .2byte -1
ec_word I ec_word I
ec_word SENSE ec_word SENSE
ec_word DANGER ec_word DANGER
; win speech @ win speech
ec_word DID ec_word DID
ec_word YOU ec_word YOU
ec_word BELIEVE ec_word BELIEVE
ec_word MY ec_word MY
ec_word LIE ec_word LIE
ec_word QUES_EXCL ec_word QUES_EXCL
; loss speech @ loss speech
ec_word I ec_word I
ec_word REALLY ec_word REALLY
ec_word DID ec_word DID
@@ -547,24 +547,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word ELLIPSIS ec_word ELLIPSIS
.4byte gVerdanturfBattleTentTrainerMons_Waren .4byte gVerdanturfBattleTentTrainerMons_Waren
; 21 @ 21
.4byte TRAINER_CLASS_FISHERMAN .4byte TRAINER_CLASS_FISHERMAN
.charmapstr "TOBIAS$", 8 .charmapstr "TOBIAS$", 8
; pre-battle speech @ pre-battle speech
ec_move2 BARRIER ec_move2 BARRIER
ec_word EXCL_EXCL ec_word EXCL_EXCL
.2byte -1 .2byte -1
ec_word NOW ec_word NOW
ec_word COME_ON ec_word COME_ON
ec_word EXCL ec_word EXCL
; win speech @ win speech
ec_word HUH_QUES ec_word HUH_QUES
ec_word YOU ec_word YOU
ec_word MEAN ec_word MEAN
ec_word I ec_word I
ec_word WON ec_word WON
ec_word QUES ec_word QUES
; loss speech @ loss speech
ec_word I ec_word I
ec_word SHOULD ec_word SHOULD
ec_word KNOW ec_word KNOW
@@ -573,24 +573,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word HOPELESS ec_word HOPELESS
.4byte gVerdanturfBattleTentTrainerMons_Tobias .4byte gVerdanturfBattleTentTrainerMons_Tobias
; 22 @ 22
.4byte TRAINER_CLASS_BIRD_KEEPER .4byte TRAINER_CLASS_BIRD_KEEPER
.charmapstr "JOSIAH$", 8 .charmapstr "JOSIAH$", 8
; pre-battle speech @ pre-battle speech
ec_word I ec_word I
ec_word PROMISE ec_word PROMISE
ec_word TO ec_word TO
ec_move1 FLY ec_move1 FLY
ec_word IF_I_LOSE ec_word IF_I_LOSE
.2byte -1 .2byte -1
; win speech @ win speech
ec_word TOO_WEAK ec_word TOO_WEAK
ec_word ELLIPSIS ec_word ELLIPSIS
.2byte -1 .2byte -1
ec_word YOU ec_word YOU
ec_move1 FLY ec_move1 FLY
ec_word INSTEAD ec_word INSTEAD
; loss speech @ loss speech
ec_word I ec_word I
ec_word PROMISE ec_word PROMISE
ec_word TO ec_word TO
@@ -599,24 +599,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word SOON ec_word SOON
.4byte gVerdanturfBattleTentTrainerMons_Josiah .4byte gVerdanturfBattleTentTrainerMons_Josiah
; 23 @ 23
.4byte TRAINER_CLASS_NINJA_BOY .4byte TRAINER_CLASS_NINJA_BOY
.charmapstr "DION$", 8 .charmapstr "DION$", 8
; pre-battle speech @ pre-battle speech
ec_word IT_S ec_word IT_S
ec_word TRENDY ec_word TRENDY
ec_word UM ec_word UM
ec_word BATTLE ec_word BATTLE
ec_word SOMETHING ec_word SOMETHING
.2byte -1 .2byte -1
; win speech @ win speech
ec_word WAS ec_word WAS
ec_word IT ec_word IT
ec_word ELLIPSIS ec_word ELLIPSIS
ec_word BATTLE ec_word BATTLE
ec_word DATE ec_word DATE
ec_word QUES ec_word QUES
; loss speech @ loss speech
ec_word WAS ec_word WAS
ec_word IT ec_word IT
ec_word ELLIPSIS ec_word ELLIPSIS
@@ -625,24 +625,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word QUES ec_word QUES
.4byte gVerdanturfBattleTentTrainerMons_Dion .4byte gVerdanturfBattleTentTrainerMons_Dion
; 24 @ 24
.4byte TRAINER_CLASS_PARASOL_LADY .4byte TRAINER_CLASS_PARASOL_LADY
.charmapstr "KENZIE$", 8 .charmapstr "KENZIE$", 8
; pre-battle speech @ pre-battle speech
ec_word THE ec_word THE
ec_move1 MORNING_SUN ec_move1 MORNING_SUN
ec_word GIVES ec_word GIVES
ec_word ME ec_word ME
ec_move1 STRENGTH ec_move1 STRENGTH
.2byte -1 .2byte -1
; win speech @ win speech
ec_word BUT ec_word BUT
ec_word I ec_word I
ec_word LIKE ec_word LIKE
ec_move2 MOONLIGHT ec_move2 MOONLIGHT
ec_word TOO ec_word TOO
.2byte -1 .2byte -1
; loss speech @ loss speech
ec_word YOU_RE ec_word YOU_RE
ec_word LIKE ec_word LIKE
ec_word A ec_word A
@@ -651,24 +651,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word ELLIPSIS ec_word ELLIPSIS
.4byte gVerdanturfBattleTentTrainerMons_Kenzie .4byte gVerdanturfBattleTentTrainerMons_Kenzie
; 25 @ 25
.4byte TRAINER_CLASS_SWIMMER_F .4byte TRAINER_CLASS_SWIMMER_F
.charmapstr "LILLIAN$", 8 .charmapstr "LILLIAN$", 8
; pre-battle speech @ pre-battle speech
ec_word I ec_word I
ec_word DO ec_word DO
ec_word THINGS ec_word THINGS
ec_word AT ec_word AT
ec_word MY ec_word MY
ec_word OWN_TEMPO ec_word OWN_TEMPO
; win speech @ win speech
ec_word I ec_word I
ec_word WON ec_word WON
ec_word QUES ec_word QUES
ec_word WHAT ec_word WHAT
ec_word A ec_word A
ec_word SURPRISE ec_word SURPRISE
; loss speech @ loss speech
ec_word AWW ec_word AWW
ec_word ELLIPSIS ec_word ELLIPSIS
ec_word I ec_word I
@@ -677,24 +677,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word NAP ec_word NAP
.4byte gVerdanturfBattleTentTrainerMons_Lillian .4byte gVerdanturfBattleTentTrainerMons_Lillian
; 26 @ 26
.4byte TRAINER_CLASS_PICNICKER .4byte TRAINER_CLASS_PICNICKER
.charmapstr "LESLEY$", 8 .charmapstr "LESLEY$", 8
; pre-battle speech @ pre-battle speech
ec_word YOU ec_word YOU
ec_word SHOULD ec_word SHOULD
ec_word NOT ec_word NOT
ec_word BE ec_word BE
ec_word LOLLING ec_word LOLLING
ec_word ABOUT ec_word ABOUT
; win speech @ win speech
ec_word YOU ec_word YOU
ec_word SHOULD ec_word SHOULD
ec_word GET ec_word GET
ec_word UP ec_word UP
ec_word EARLIER ec_word EARLIER
.2byte -1 .2byte -1
; loss speech @ loss speech
ec_word THIS ec_word THIS
ec_word SHOULD ec_word SHOULD
ec_word NOT ec_word NOT
@@ -703,24 +703,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word EXCL ec_word EXCL
.4byte gVerdanturfBattleTentTrainerMons_Lesley .4byte gVerdanturfBattleTentTrainerMons_Lesley
; 27 @ 27
.4byte TRAINER_CLASS_SAILOR .4byte TRAINER_CLASS_SAILOR
.charmapstr "MARQUIS$", 8 .charmapstr "MARQUIS$", 8
; pre-battle speech @ pre-battle speech
ec_word NONE ec_word NONE
ec_word OF ec_word OF
ec_word THIS ec_word THIS
ec_word IS ec_word IS
ec_word MAKING ec_word MAKING
ec_word SENSE ec_word SENSE
; win speech @ win speech
ec_word SEE ec_word SEE
ec_word QUES ec_word QUES
ec_word THIS ec_word THIS
ec_word JUST ec_word JUST
ec_word ISN_T ec_word ISN_T
ec_word NORMAL ec_word NORMAL
; loss speech @ loss speech
ec_word SHOULD ec_word SHOULD
ec_word I ec_word I
ec_word CAUSE ec_word CAUSE
@@ -729,24 +729,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word QUES ec_word QUES
.4byte gVerdanturfBattleTentTrainerMons_Marquis .4byte gVerdanturfBattleTentTrainerMons_Marquis
; 28 @ 28
.4byte TRAINER_CLASS_COLLECTOR .4byte TRAINER_CLASS_COLLECTOR
.charmapstr "FREDDY$", 8 .charmapstr "FREDDY$", 8
; pre-battle speech @ pre-battle speech
ec_word I ec_word I
ec_word ADORE ec_word ADORE
ec_word THIS ec_word THIS
ec_word CUTE ec_word CUTE
ec_word TELEVISION ec_word TELEVISION
ec_word IDOL ec_word IDOL
; win speech @ win speech
ec_word YOU_RE ec_word YOU_RE
ec_word SO ec_word SO
ec_word FUNNY ec_word FUNNY
ec_word WHEN ec_word WHEN
ec_word YOU_RE ec_word YOU_RE
ec_word ANGRY ec_word ANGRY
; loss speech @ loss speech
ec_word LATE ec_word LATE
ec_word NIGHT ec_word NIGHT
ec_word TELEVISION ec_word TELEVISION
@@ -755,24 +755,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
ec_word LIFE ec_word LIFE
.4byte gVerdanturfBattleTentTrainerMons_Freddy .4byte gVerdanturfBattleTentTrainerMons_Freddy
; 29 @ 29
.4byte TRAINER_CLASS_LASS .4byte TRAINER_CLASS_LASS
.charmapstr "CECILIA$", 8 .charmapstr "CECILIA$", 8
; pre-battle speech @ pre-battle speech
ec_word MY ec_word MY
ec_word FABULOUS ec_word FABULOUS
ec_word CUTENESS ec_word CUTENESS
ec_word IS ec_word IS
ec_word IN ec_word IN
ec_word FASHION ec_word FASHION
; win speech @ win speech
ec_word YOU_RE ec_word YOU_RE
ec_word NO ec_word NO
ec_word MATCH ec_word MATCH
ec_word FOR ec_word FOR
ec_word MY ec_word MY
ec_word CUTE_CHARM ec_word CUTE_CHARM
; loss speech @ loss speech
ec_word DON_T ec_word DON_T
ec_word YOU ec_word YOU
ec_word HAVE ec_word HAVE
data/battle_moves.s
+2841 -2841
View File
File diff suppressed because it is too large Load Diff
data/berries.s
+474 -474
View File
File diff suppressed because it is too large Load Diff
data/contest_effect_function_table.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0 .align 2, 0
gContestEffectFunctionTable: ; 858CECC gContestEffectFunctionTable: @ 858CECC
.4byte ContestEffectFunc_080E547C .4byte ContestEffectFunc_080E547C
.4byte ContestEffectFunc_080E5480 .4byte ContestEffectFunc_080E5480
.4byte ContestEffectFunc_080E54B0 .4byte ContestEffectFunc_080E54B0
data/contest_effects.s
+241 -241
View File
@@ -1,290 +1,290 @@
.align 2, 0 .align 2, 0
gContestEffects: ; 858CDCC gContestEffects: @ 858CDCC
; 0x00 @ 0x00
.byte 0 ; effect type .byte 0 @ effect type
.byte 40 ; appeal .byte 40 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x01 @ 0x01
.byte 0 ; effect type .byte 0 @ effect type
.byte 60 ; appeal .byte 60 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x02 @ 0x02
.byte 0 ; effect type .byte 0 @ effect type
.byte 80 ; appeal .byte 80 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x03 @ 0x03
.byte 0 ; effect type .byte 0 @ effect type
.byte 30 ; appeal .byte 30 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x04 @ 0x04
.byte 1 ; effect type .byte 1 @ effect type
.byte 20 ; appeal .byte 20 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x05 @ 0x05
.byte 1 ; effect type .byte 1 @ effect type
.byte 10 ; appeal .byte 10 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x06 @ 0x06
.byte 1 ; effect type .byte 1 @ effect type
.byte 30 ; appeal .byte 30 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x07 @ 0x07
.byte 1 ; effect type .byte 1 @ effect type
.byte 30 ; appeal .byte 30 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x08 @ 0x08
.byte 2 ; effect type .byte 2 @ effect type
.byte 30 ; appeal .byte 30 @ appeal
.byte 20 ; jam .byte 20 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x09 @ 0x09
.byte 3 ; effect type .byte 3 @ effect type
.byte 30 ; appeal .byte 30 @ appeal
.byte 10 ; jam .byte 10 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x0a @ 0x0a
.byte 2 ; effect type .byte 2 @ effect type
.byte 20 ; appeal .byte 20 @ appeal
.byte 30 ; jam .byte 30 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x0b @ 0x0b
.byte 3 ; effect type .byte 3 @ effect type
.byte 20 ; appeal .byte 20 @ appeal
.byte 20 ; jam .byte 20 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x0c @ 0x0c
.byte 2 ; effect type .byte 2 @ effect type
.byte 10 ; appeal .byte 10 @ appeal
.byte 40 ; jam .byte 40 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x0d @ 0x0d
.byte 3 ; effect type .byte 3 @ effect type
.byte 10 ; appeal .byte 10 @ appeal
.byte 30 ; jam .byte 30 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x0e @ 0x0e
.byte 2 ; effect type .byte 2 @ effect type
.byte 30 ; appeal .byte 30 @ appeal
.byte 20 ; jam .byte 20 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x0f @ 0x0f
.byte 3 ; effect type .byte 3 @ effect type
.byte 30 ; appeal .byte 30 @ appeal
.byte 10 ; jam .byte 10 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x10 @ 0x10
.byte 4 ; effect type .byte 4 @ effect type
.byte 30 ; appeal .byte 30 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x11 @ 0x11
.byte 3 ; effect type .byte 3 @ effect type
.byte 20 ; appeal .byte 20 @ appeal
.byte 10 ; jam .byte 10 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x12 @ 0x12
.byte 3 ; effect type .byte 3 @ effect type
.byte 40 ; appeal .byte 40 @ appeal
.byte 40 ; jam .byte 40 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x13 @ 0x13
.byte 3 ; effect type .byte 3 @ effect type
.byte 20 ; appeal .byte 20 @ appeal
.byte 10 ; jam .byte 10 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x14 @ 0x14
.byte 3 ; effect type .byte 3 @ effect type
.byte 20 ; appeal .byte 20 @ appeal
.byte 10 ; jam .byte 10 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x15 @ 0x15
.byte 3 ; effect type .byte 3 @ effect type
.byte 20 ; appeal .byte 20 @ appeal
.byte 10 ; jam .byte 10 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x16 @ 0x16
.byte 3 ; effect type .byte 3 @ effect type
.byte 20 ; appeal .byte 20 @ appeal
.byte 10 ; jam .byte 10 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x17 @ 0x17
.byte 3 ; effect type .byte 3 @ effect type
.byte 20 ; appeal .byte 20 @ appeal
.byte 10 ; jam .byte 10 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x18 @ 0x18
.byte 3 ; effect type .byte 3 @ effect type
.byte 20 ; appeal .byte 20 @ appeal
.byte 10 ; jam .byte 10 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x19 @ 0x19
.byte 4 ; effect type .byte 4 @ effect type
.byte 20 ; appeal .byte 20 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x1a @ 0x1a
.byte 4 ; effect type .byte 4 @ effect type
.byte 20 ; appeal .byte 20 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x1b @ 0x1b
.byte 4 ; effect type .byte 4 @ effect type
.byte 30 ; appeal .byte 30 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x1c @ 0x1c
.byte 3 ; effect type .byte 3 @ effect type
.byte 30 ; appeal .byte 30 @ appeal
.byte 10 ; jam .byte 10 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x1d @ 0x1d
.byte 5 ; effect type .byte 5 @ effect type
.byte 20 ; appeal .byte 20 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x1e @ 0x1e
.byte 5 ; effect type .byte 5 @ effect type
.byte 20 ; appeal .byte 20 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x1f @ 0x1f
.byte 5 ; effect type .byte 5 @ effect type
.byte 10 ; appeal .byte 10 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x20 @ 0x20
.byte 5 ; effect type .byte 5 @ effect type
.byte 10 ; appeal .byte 10 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x21 @ 0x21
.byte 5 ; effect type .byte 5 @ effect type
.byte 10 ; appeal .byte 10 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x22 @ 0x22
.byte 5 ; effect type .byte 5 @ effect type
.byte 10 ; appeal .byte 10 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x23 @ 0x23
.byte 5 ; effect type .byte 5 @ effect type
.byte 20 ; appeal .byte 20 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x24 @ 0x24
.byte 5 ; effect type .byte 5 @ effect type
.byte 20 ; appeal .byte 20 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x25 @ 0x25
.byte 5 ; effect type .byte 5 @ effect type
.byte 30 ; appeal .byte 30 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x26 @ 0x26
.byte 5 ; effect type .byte 5 @ effect type
.byte 10 ; appeal .byte 10 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x27 @ 0x27
.byte 5 ; effect type .byte 5 @ effect type
.byte 10 ; appeal .byte 10 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x28 @ 0x28
.byte 6 ; effect type .byte 6 @ effect type
.byte 30 ; appeal .byte 30 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x29 @ 0x29
.byte 6 ; effect type .byte 6 @ effect type
.byte 30 ; appeal .byte 30 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x2a @ 0x2a
.byte 6 ; effect type .byte 6 @ effect type
.byte 30 ; appeal .byte 30 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x2b @ 0x2b
.byte 6 ; effect type .byte 6 @ effect type
.byte 30 ; appeal .byte 30 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x2c @ 0x2c
.byte 5 ; effect type .byte 5 @ effect type
.byte 10 ; appeal .byte 10 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x2d @ 0x2d
.byte 3 ; effect type .byte 3 @ effect type
.byte 20 ; appeal .byte 20 @ appeal
.byte 10 ; jam .byte 10 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x2e @ 0x2e
.byte 5 ; effect type .byte 5 @ effect type
.byte 10 ; appeal .byte 10 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
; 0x2f @ 0x2f
.byte 4 ; effect type .byte 4 @ effect type
.byte 30 ; appeal .byte 30 @ appeal
.byte 0 ; jam .byte 0 @ jam
.byte 0 ; padding .byte 0 @ padding
data/contest_moves.s
+1776 -1776
View File
File diff suppressed because it is too large Load Diff
data/data1.s
+414 -414
View File
File diff suppressed because it is too large Load Diff
data/data2.s
+4402 -4402
View File
File diff suppressed because it is too large Load Diff
data/egg_moves.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0 .align 2, 0
gEggMoves: ; 832ADD8 gEggMoves: @ 832ADD8
egg_moves_begin SPECIES_BULBASAUR egg_moves_begin SPECIES_BULBASAUR
.2byte MOVE_LIGHT_SCREEN .2byte MOVE_LIGHT_SCREEN
.2byte MOVE_SKULL_BASH .2byte MOVE_SKULL_BASH
data/event_script_command_function_table.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0 .align 2, 0
gEventScriptCommandFunctionTable: ; 81DB67C gEventScriptCommandFunctionTable: @ 81DB67C
.4byte s00_nop .4byte s00_nop
.4byte s01_nop .4byte s01_nop
.4byte s02_end .4byte s02_end
data/evolution_table.s
+413 -413
View File
File diff suppressed because it is too large Load Diff
data/experience_tables.s
+2 -2
View File
@@ -1,12 +1,12 @@
.align 2, 0 .align 2, 0
gExperienceTables: ; 831F72C gExperienceTables: @ 831F72C
.include "data/experience_tables/medium_fast_growth_rate.s" .include "data/experience_tables/medium_fast_growth_rate.s"
.include "data/experience_tables/erratic_growth_rate.s" .include "data/experience_tables/erratic_growth_rate.s"
.include "data/experience_tables/fluctuating_growth_rate.s" .include "data/experience_tables/fluctuating_growth_rate.s"
.include "data/experience_tables/medium_slow_growth_rate.s" .include "data/experience_tables/medium_slow_growth_rate.s"
.include "data/experience_tables/fast_growth_rate.s" .include "data/experience_tables/fast_growth_rate.s"
.include "data/experience_tables/slow_growth_rate.s" .include "data/experience_tables/slow_growth_rate.s"
; TODO: find out if these copies are used @ TODO: find out if these copies are used
.include "data/experience_tables/medium_fast_growth_rate.s" .include "data/experience_tables/medium_fast_growth_rate.s"
.include "data/experience_tables/medium_fast_growth_rate.s" .include "data/experience_tables/medium_fast_growth_rate.s"
data/experience_tables/erratic_growth_rate.s
+101 -101
View File
@@ -1,101 +1,101 @@
.4byte 0 ; 0 .4byte 0 @ 0
.4byte 1 ; 1 .4byte 1 @ 1
.4byte 15 ; 2 .4byte 15 @ 2
.4byte 52 ; 3 .4byte 52 @ 3
.4byte 122 ; 4 .4byte 122 @ 4
.4byte 237 ; 5 .4byte 237 @ 5
.4byte 406 ; 6 .4byte 406 @ 6
.4byte 637 ; 7 .4byte 637 @ 7
.4byte 942 ; 8 .4byte 942 @ 8
.4byte 1326 ; 9 .4byte 1326 @ 9
.4byte 1800 ; 10 .4byte 1800 @ 10
.4byte 2369 ; 11 .4byte 2369 @ 11
.4byte 3041 ; 12 .4byte 3041 @ 12
.4byte 3822 ; 13 .4byte 3822 @ 13
.4byte 4719 ; 14 .4byte 4719 @ 14
.4byte 5737 ; 15 .4byte 5737 @ 15
.4byte 6881 ; 16 .4byte 6881 @ 16
.4byte 8155 ; 17 .4byte 8155 @ 17
.4byte 9564 ; 18 .4byte 9564 @ 18
.4byte 11111 ; 19 .4byte 11111 @ 19
.4byte 12800 ; 20 .4byte 12800 @ 20
.4byte 14632 ; 21 .4byte 14632 @ 21
.4byte 16610 ; 22 .4byte 16610 @ 22
.4byte 18737 ; 23 .4byte 18737 @ 23
.4byte 21012 ; 24 .4byte 21012 @ 24
.4byte 23437 ; 25 .4byte 23437 @ 25
.4byte 26012 ; 26 .4byte 26012 @ 26
.4byte 28737 ; 27 .4byte 28737 @ 27
.4byte 31610 ; 28 .4byte 31610 @ 28
.4byte 34632 ; 29 .4byte 34632 @ 29
.4byte 37800 ; 30 .4byte 37800 @ 30
.4byte 41111 ; 31 .4byte 41111 @ 31
.4byte 44564 ; 32 .4byte 44564 @ 32
.4byte 48155 ; 33 .4byte 48155 @ 33
.4byte 51881 ; 34 .4byte 51881 @ 34
.4byte 55737 ; 35 .4byte 55737 @ 35
.4byte 59719 ; 36 .4byte 59719 @ 36
.4byte 63822 ; 37 .4byte 63822 @ 37
.4byte 68041 ; 38 .4byte 68041 @ 38
.4byte 72369 ; 39 .4byte 72369 @ 39
.4byte 76800 ; 40 .4byte 76800 @ 40
.4byte 81326 ; 41 .4byte 81326 @ 41
.4byte 85942 ; 42 .4byte 85942 @ 42
.4byte 90637 ; 43 .4byte 90637 @ 43
.4byte 95406 ; 44 .4byte 95406 @ 44
.4byte 100237 ; 45 .4byte 100237 @ 45
.4byte 105122 ; 46 .4byte 105122 @ 46
.4byte 110052 ; 47 .4byte 110052 @ 47
.4byte 115015 ; 48 .4byte 115015 @ 48
.4byte 120001 ; 49 .4byte 120001 @ 49
.4byte 125000 ; 50 .4byte 125000 @ 50
.4byte 131324 ; 51 .4byte 131324 @ 51
.4byte 137795 ; 52 .4byte 137795 @ 52
.4byte 144410 ; 53 .4byte 144410 @ 53
.4byte 151165 ; 54 .4byte 151165 @ 54
.4byte 158056 ; 55 .4byte 158056 @ 55
.4byte 165079 ; 56 .4byte 165079 @ 56
.4byte 172229 ; 57 .4byte 172229 @ 57
.4byte 179503 ; 58 .4byte 179503 @ 58
.4byte 186894 ; 59 .4byte 186894 @ 59
.4byte 194400 ; 60 .4byte 194400 @ 60
.4byte 202013 ; 61 .4byte 202013 @ 61
.4byte 209728 ; 62 .4byte 209728 @ 62
.4byte 217540 ; 63 .4byte 217540 @ 63
.4byte 225443 ; 64 .4byte 225443 @ 64
.4byte 233431 ; 65 .4byte 233431 @ 65
.4byte 241496 ; 66 .4byte 241496 @ 66
.4byte 249633 ; 67 .4byte 249633 @ 67
.4byte 257834 ; 68 .4byte 257834 @ 68
.4byte 267406 ; 69 .4byte 267406 @ 69
.4byte 276458 ; 70 .4byte 276458 @ 70
.4byte 286328 ; 71 .4byte 286328 @ 71
.4byte 296358 ; 72 .4byte 296358 @ 72
.4byte 305767 ; 73 .4byte 305767 @ 73
.4byte 316074 ; 74 .4byte 316074 @ 74
.4byte 326531 ; 75 .4byte 326531 @ 75
.4byte 336255 ; 76 .4byte 336255 @ 76
.4byte 346965 ; 77 .4byte 346965 @ 77
.4byte 357812 ; 78 .4byte 357812 @ 78
.4byte 367807 ; 79 .4byte 367807 @ 79
.4byte 378880 ; 80 .4byte 378880 @ 80
.4byte 390077 ; 81 .4byte 390077 @ 81
.4byte 400293 ; 82 .4byte 400293 @ 82
.4byte 411686 ; 83 .4byte 411686 @ 83
.4byte 423190 ; 84 .4byte 423190 @ 84
.4byte 433572 ; 85 .4byte 433572 @ 85
.4byte 445239 ; 86 .4byte 445239 @ 86
.4byte 457001 ; 87 .4byte 457001 @ 87
.4byte 467489 ; 88 .4byte 467489 @ 88
.4byte 479378 ; 89 .4byte 479378 @ 89
.4byte 491346 ; 90 .4byte 491346 @ 90
.4byte 501878 ; 91 .4byte 501878 @ 91
.4byte 513934 ; 92 .4byte 513934 @ 92
.4byte 526049 ; 93 .4byte 526049 @ 93
.4byte 536557 ; 94 .4byte 536557 @ 94
.4byte 548720 ; 95 .4byte 548720 @ 95
.4byte 560922 ; 96 .4byte 560922 @ 96
.4byte 571333 ; 97 .4byte 571333 @ 97
.4byte 583539 ; 98 .4byte 583539 @ 98
.4byte 591882 ; 99 .4byte 591882 @ 99
.4byte 600000 ; 100 .4byte 600000 @ 100
data/experience_tables/fast_growth_rate.s
+101 -101
View File
@@ -1,101 +1,101 @@
.4byte 0 ; 0 .4byte 0 @ 0
.4byte 1 ; 1 .4byte 1 @ 1
.4byte 6 ; 2 .4byte 6 @ 2
.4byte 21 ; 3 .4byte 21 @ 3
.4byte 51 ; 4 .4byte 51 @ 4
.4byte 100 ; 5 .4byte 100 @ 5
.4byte 172 ; 6 .4byte 172 @ 6
.4byte 274 ; 7 .4byte 274 @ 7
.4byte 409 ; 8 .4byte 409 @ 8
.4byte 583 ; 9 .4byte 583 @ 9
.4byte 800 ; 10 .4byte 800 @ 10
.4byte 1064 ; 11 .4byte 1064 @ 11
.4byte 1382 ; 12 .4byte 1382 @ 12
.4byte 1757 ; 13 .4byte 1757 @ 13
.4byte 2195 ; 14 .4byte 2195 @ 14
.4byte 2700 ; 15 .4byte 2700 @ 15
.4byte 3276 ; 16 .4byte 3276 @ 16
.4byte 3930 ; 17 .4byte 3930 @ 17
.4byte 4665 ; 18 .4byte 4665 @ 18
.4byte 5487 ; 19 .4byte 5487 @ 19
.4byte 6400 ; 20 .4byte 6400 @ 20
.4byte 7408 ; 21 .4byte 7408 @ 21
.4byte 8518 ; 22 .4byte 8518 @ 22
.4byte 9733 ; 23 .4byte 9733 @ 23
.4byte 11059 ; 24 .4byte 11059 @ 24
.4byte 12500 ; 25 .4byte 12500 @ 25
.4byte 14060 ; 26 .4byte 14060 @ 26
.4byte 15746 ; 27 .4byte 15746 @ 27
.4byte 17561 ; 28 .4byte 17561 @ 28
.4byte 19511 ; 29 .4byte 19511 @ 29
.4byte 21600 ; 30 .4byte 21600 @ 30
.4byte 23832 ; 31 .4byte 23832 @ 31
.4byte 26214 ; 32 .4byte 26214 @ 32
.4byte 28749 ; 33 .4byte 28749 @ 33
.4byte 31443 ; 34 .4byte 31443 @ 34
.4byte 34300 ; 35 .4byte 34300 @ 35
.4byte 37324 ; 36 .4byte 37324 @ 36
.4byte 40522 ; 37 .4byte 40522 @ 37
.4byte 43897 ; 38 .4byte 43897 @ 38
.4byte 47455 ; 39 .4byte 47455 @ 39
.4byte 51200 ; 40 .4byte 51200 @ 40
.4byte 55136 ; 41 .4byte 55136 @ 41
.4byte 59270 ; 42 .4byte 59270 @ 42
.4byte 63605 ; 43 .4byte 63605 @ 43
.4byte 68147 ; 44 .4byte 68147 @ 44
.4byte 72900 ; 45 .4byte 72900 @ 45
.4byte 77868 ; 46 .4byte 77868 @ 46
.4byte 83058 ; 47 .4byte 83058 @ 47
.4byte 88473 ; 48 .4byte 88473 @ 48
.4byte 94119 ; 49 .4byte 94119 @ 49
.4byte 100000 ; 50 .4byte 100000 @ 50
.4byte 106120 ; 51 .4byte 106120 @ 51
.4byte 112486 ; 52 .4byte 112486 @ 52
.4byte 119101 ; 53 .4byte 119101 @ 53
.4byte 125971 ; 54 .4byte 125971 @ 54
.4byte 133100 ; 55 .4byte 133100 @ 55
.4byte 140492 ; 56 .4byte 140492 @ 56
.4byte 148154 ; 57 .4byte 148154 @ 57
.4byte 156089 ; 58 .4byte 156089 @ 58
.4byte 164303 ; 59 .4byte 164303 @ 59
.4byte 172800 ; 60 .4byte 172800 @ 60
.4byte 181584 ; 61 .4byte 181584 @ 61
.4byte 190662 ; 62 .4byte 190662 @ 62
.4byte 200037 ; 63 .4byte 200037 @ 63
.4byte 209715 ; 64 .4byte 209715 @ 64
.4byte 219700 ; 65 .4byte 219700 @ 65
.4byte 229996 ; 66 .4byte 229996 @ 66
.4byte 240610 ; 67 .4byte 240610 @ 67
.4byte 251545 ; 68 .4byte 251545 @ 68
.4byte 262807 ; 69 .4byte 262807 @ 69
.4byte 274400 ; 70 .4byte 274400 @ 70
.4byte 286328 ; 71 .4byte 286328 @ 71
.4byte 298598 ; 72 .4byte 298598 @ 72
.4byte 311213 ; 73 .4byte 311213 @ 73
.4byte 324179 ; 74 .4byte 324179 @ 74
.4byte 337500 ; 75 .4byte 337500 @ 75
.4byte 351180 ; 76 .4byte 351180 @ 76
.4byte 365226 ; 77 .4byte 365226 @ 77
.4byte 379641 ; 78 .4byte 379641 @ 78
.4byte 394431 ; 79 .4byte 394431 @ 79
.4byte 409600 ; 80 .4byte 409600 @ 80
.4byte 425152 ; 81 .4byte 425152 @ 81
.4byte 441094 ; 82 .4byte 441094 @ 82
.4byte 457429 ; 83 .4byte 457429 @ 83
.4byte 474163 ; 84 .4byte 474163 @ 84
.4byte 491300 ; 85 .4byte 491300 @ 85
.4byte 508844 ; 86 .4byte 508844 @ 86
.4byte 526802 ; 87 .4byte 526802 @ 87
.4byte 545177 ; 88 .4byte 545177 @ 88
.4byte 563975 ; 89 .4byte 563975 @ 89
.4byte 583200 ; 90 .4byte 583200 @ 90
.4byte 602856 ; 91 .4byte 602856 @ 91
.4byte 622950 ; 92 .4byte 622950 @ 92
.4byte 643485 ; 93 .4byte 643485 @ 93
.4byte 664467 ; 94 .4byte 664467 @ 94
.4byte 685900 ; 95 .4byte 685900 @ 95
.4byte 707788 ; 96 .4byte 707788 @ 96
.4byte 730138 ; 97 .4byte 730138 @ 97
.4byte 752953 ; 98 .4byte 752953 @ 98
.4byte 776239 ; 99 .4byte 776239 @ 99
.4byte 800000 ; 100 .4byte 800000 @ 100
data/experience_tables/fluctuating_growth_rate.s
+101 -101
View File
@@ -1,101 +1,101 @@
.4byte 0 ; 0 .4byte 0 @ 0
.4byte 1 ; 1 .4byte 1 @ 1
.4byte 4 ; 2 .4byte 4 @ 2
.4byte 13 ; 3 .4byte 13 @ 3
.4byte 32 ; 4 .4byte 32 @ 4
.4byte 65 ; 5 .4byte 65 @ 5
.4byte 112 ; 6 .4byte 112 @ 6
.4byte 178 ; 7 .4byte 178 @ 7
.4byte 276 ; 8 .4byte 276 @ 8
.4byte 393 ; 9 .4byte 393 @ 9
.4byte 540 ; 10 .4byte 540 @ 10
.4byte 745 ; 11 .4byte 745 @ 11
.4byte 967 ; 12 .4byte 967 @ 12
.4byte 1230 ; 13 .4byte 1230 @ 13
.4byte 1591 ; 14 .4byte 1591 @ 14
.4byte 1957 ; 15 .4byte 1957 @ 15
.4byte 2457 ; 16 .4byte 2457 @ 16
.4byte 3046 ; 17 .4byte 3046 @ 17
.4byte 3732 ; 18 .4byte 3732 @ 18
.4byte 4526 ; 19 .4byte 4526 @ 19
.4byte 5440 ; 20 .4byte 5440 @ 20
.4byte 6482 ; 21 .4byte 6482 @ 21
.4byte 7666 ; 22 .4byte 7666 @ 22
.4byte 9003 ; 23 .4byte 9003 @ 23
.4byte 10506 ; 24 .4byte 10506 @ 24
.4byte 12187 ; 25 .4byte 12187 @ 25
.4byte 14060 ; 26 .4byte 14060 @ 26
.4byte 16140 ; 27 .4byte 16140 @ 27
.4byte 18439 ; 28 .4byte 18439 @ 28
.4byte 20974 ; 29 .4byte 20974 @ 29
.4byte 23760 ; 30 .4byte 23760 @ 30
.4byte 26811 ; 31 .4byte 26811 @ 31
.4byte 30146 ; 32 .4byte 30146 @ 32
.4byte 33780 ; 33 .4byte 33780 @ 33
.4byte 37731 ; 34 .4byte 37731 @ 34
.4byte 42017 ; 35 .4byte 42017 @ 35
.4byte 46656 ; 36 .4byte 46656 @ 36
.4byte 50653 ; 37 .4byte 50653 @ 37
.4byte 55969 ; 38 .4byte 55969 @ 38
.4byte 60505 ; 39 .4byte 60505 @ 39
.4byte 66560 ; 40 .4byte 66560 @ 40
.4byte 71677 ; 41 .4byte 71677 @ 41
.4byte 78533 ; 42 .4byte 78533 @ 42
.4byte 84277 ; 43 .4byte 84277 @ 43
.4byte 91998 ; 44 .4byte 91998 @ 44
.4byte 98415 ; 45 .4byte 98415 @ 45
.4byte 107069 ; 46 .4byte 107069 @ 46
.4byte 114205 ; 47 .4byte 114205 @ 47
.4byte 123863 ; 48 .4byte 123863 @ 48
.4byte 131766 ; 49 .4byte 131766 @ 49
.4byte 142500 ; 50 .4byte 142500 @ 50
.4byte 151222 ; 51 .4byte 151222 @ 51
.4byte 163105 ; 52 .4byte 163105 @ 52
.4byte 172697 ; 53 .4byte 172697 @ 53
.4byte 185807 ; 54 .4byte 185807 @ 54
.4byte 196322 ; 55 .4byte 196322 @ 55
.4byte 210739 ; 56 .4byte 210739 @ 56
.4byte 222231 ; 57 .4byte 222231 @ 57
.4byte 238036 ; 58 .4byte 238036 @ 58
.4byte 250562 ; 59 .4byte 250562 @ 59
.4byte 267840 ; 60 .4byte 267840 @ 60
.4byte 281456 ; 61 .4byte 281456 @ 61
.4byte 300293 ; 62 .4byte 300293 @ 62
.4byte 315059 ; 63 .4byte 315059 @ 63
.4byte 335544 ; 64 .4byte 335544 @ 64
.4byte 351520 ; 65 .4byte 351520 @ 65
.4byte 373744 ; 66 .4byte 373744 @ 66
.4byte 390991 ; 67 .4byte 390991 @ 67
.4byte 415050 ; 68 .4byte 415050 @ 68
.4byte 433631 ; 69 .4byte 433631 @ 69
.4byte 459620 ; 70 .4byte 459620 @ 70
.4byte 479600 ; 71 .4byte 479600 @ 71
.4byte 507617 ; 72 .4byte 507617 @ 72
.4byte 529063 ; 73 .4byte 529063 @ 73
.4byte 559209 ; 74 .4byte 559209 @ 74
.4byte 582187 ; 75 .4byte 582187 @ 75
.4byte 614566 ; 76 .4byte 614566 @ 76
.4byte 639146 ; 77 .4byte 639146 @ 77
.4byte 673863 ; 78 .4byte 673863 @ 78
.4byte 700115 ; 79 .4byte 700115 @ 79
.4byte 737280 ; 80 .4byte 737280 @ 80
.4byte 765275 ; 81 .4byte 765275 @ 81
.4byte 804997 ; 82 .4byte 804997 @ 82
.4byte 834809 ; 83 .4byte 834809 @ 83
.4byte 877201 ; 84 .4byte 877201 @ 84
.4byte 908905 ; 85 .4byte 908905 @ 85
.4byte 954084 ; 86 .4byte 954084 @ 86
.4byte 987754 ; 87 .4byte 987754 @ 87
.4byte 1035837 ; 88 .4byte 1035837 @ 88
.4byte 1071552 ; 89 .4byte 1071552 @ 89
.4byte 1122660 ; 90 .4byte 1122660 @ 90
.4byte 1160499 ; 91 .4byte 1160499 @ 91
.4byte 1214753 ; 92 .4byte 1214753 @ 92
.4byte 1254796 ; 93 .4byte 1254796 @ 93
.4byte 1312322 ; 94 .4byte 1312322 @ 94
.4byte 1354652 ; 95 .4byte 1354652 @ 95
.4byte 1415577 ; 96 .4byte 1415577 @ 96
.4byte 1460276 ; 97 .4byte 1460276 @ 97
.4byte 1524731 ; 98 .4byte 1524731 @ 98
.4byte 1571884 ; 99 .4byte 1571884 @ 99
.4byte 1640000 ; 100 .4byte 1640000 @ 100
data/experience_tables/medium_fast_growth_rate.s
+101 -101
View File
@@ -1,101 +1,101 @@
.4byte 0 ; 0 .4byte 0 @ 0
.4byte 1 ; 1 .4byte 1 @ 1
.4byte 8 ; 2 .4byte 8 @ 2
.4byte 27 ; 3 .4byte 27 @ 3
.4byte 64 ; 4 .4byte 64 @ 4
.4byte 125 ; 5 .4byte 125 @ 5
.4byte 216 ; 6 .4byte 216 @ 6
.4byte 343 ; 7 .4byte 343 @ 7
.4byte 512 ; 8 .4byte 512 @ 8
.4byte 729 ; 9 .4byte 729 @ 9
.4byte 1000 ; 10 .4byte 1000 @ 10
.4byte 1331 ; 11 .4byte 1331 @ 11
.4byte 1728 ; 12 .4byte 1728 @ 12
.4byte 2197 ; 13 .4byte 2197 @ 13
.4byte 2744 ; 14 .4byte 2744 @ 14
.4byte 3375 ; 15 .4byte 3375 @ 15
.4byte 4096 ; 16 .4byte 4096 @ 16
.4byte 4913 ; 17 .4byte 4913 @ 17
.4byte 5832 ; 18 .4byte 5832 @ 18
.4byte 6859 ; 19 .4byte 6859 @ 19
.4byte 8000 ; 20 .4byte 8000 @ 20
.4byte 9261 ; 21 .4byte 9261 @ 21
.4byte 10648 ; 22 .4byte 10648 @ 22
.4byte 12167 ; 23 .4byte 12167 @ 23
.4byte 13824 ; 24 .4byte 13824 @ 24
.4byte 15625 ; 25 .4byte 15625 @ 25
.4byte 17576 ; 26 .4byte 17576 @ 26
.4byte 19683 ; 27 .4byte 19683 @ 27
.4byte 21952 ; 28 .4byte 21952 @ 28
.4byte 24389 ; 29 .4byte 24389 @ 29
.4byte 27000 ; 30 .4byte 27000 @ 30
.4byte 29791 ; 31 .4byte 29791 @ 31
.4byte 32768 ; 32 .4byte 32768 @ 32
.4byte 35937 ; 33 .4byte 35937 @ 33
.4byte 39304 ; 34 .4byte 39304 @ 34
.4byte 42875 ; 35 .4byte 42875 @ 35
.4byte 46656 ; 36 .4byte 46656 @ 36
.4byte 50653 ; 37 .4byte 50653 @ 37
.4byte 54872 ; 38 .4byte 54872 @ 38
.4byte 59319 ; 39 .4byte 59319 @ 39
.4byte 64000 ; 40 .4byte 64000 @ 40
.4byte 68921 ; 41 .4byte 68921 @ 41
.4byte 74088 ; 42 .4byte 74088 @ 42
.4byte 79507 ; 43 .4byte 79507 @ 43
.4byte 85184 ; 44 .4byte 85184 @ 44
.4byte 91125 ; 45 .4byte 91125 @ 45
.4byte 97336 ; 46 .4byte 97336 @ 46
.4byte 103823 ; 47 .4byte 103823 @ 47
.4byte 110592 ; 48 .4byte 110592 @ 48
.4byte 117649 ; 49 .4byte 117649 @ 49
.4byte 125000 ; 50 .4byte 125000 @ 50
.4byte 132651 ; 51 .4byte 132651 @ 51
.4byte 140608 ; 52 .4byte 140608 @ 52
.4byte 148877 ; 53 .4byte 148877 @ 53
.4byte 157464 ; 54 .4byte 157464 @ 54
.4byte 166375 ; 55 .4byte 166375 @ 55
.4byte 175616 ; 56 .4byte 175616 @ 56
.4byte 185193 ; 57 .4byte 185193 @ 57
.4byte 195112 ; 58 .4byte 195112 @ 58
.4byte 205379 ; 59 .4byte 205379 @ 59
.4byte 216000 ; 60 .4byte 216000 @ 60
.4byte 226981 ; 61 .4byte 226981 @ 61
.4byte 238328 ; 62 .4byte 238328 @ 62
.4byte 250047 ; 63 .4byte 250047 @ 63
.4byte 262144 ; 64 .4byte 262144 @ 64
.4byte 274625 ; 65 .4byte 274625 @ 65
.4byte 287496 ; 66 .4byte 287496 @ 66
.4byte 300763 ; 67 .4byte 300763 @ 67
.4byte 314432 ; 68 .4byte 314432 @ 68
.4byte 328509 ; 69 .4byte 328509 @ 69
.4byte 343000 ; 70 .4byte 343000 @ 70
.4byte 357911 ; 71 .4byte 357911 @ 71
.4byte 373248 ; 72 .4byte 373248 @ 72
.4byte 389017 ; 73 .4byte 389017 @ 73
.4byte 405224 ; 74 .4byte 405224 @ 74
.4byte 421875 ; 75 .4byte 421875 @ 75
.4byte 438976 ; 76 .4byte 438976 @ 76
.4byte 456533 ; 77 .4byte 456533 @ 77
.4byte 474552 ; 78 .4byte 474552 @ 78
.4byte 493039 ; 79 .4byte 493039 @ 79
.4byte 512000 ; 80 .4byte 512000 @ 80
.4byte 531441 ; 81 .4byte 531441 @ 81
.4byte 551368 ; 82 .4byte 551368 @ 82
.4byte 571787 ; 83 .4byte 571787 @ 83
.4byte 592704 ; 84 .4byte 592704 @ 84
.4byte 614125 ; 85 .4byte 614125 @ 85
.4byte 636056 ; 86 .4byte 636056 @ 86
.4byte 658503 ; 87 .4byte 658503 @ 87
.4byte 681472 ; 88 .4byte 681472 @ 88
.4byte 704969 ; 89 .4byte 704969 @ 89
.4byte 729000 ; 90 .4byte 729000 @ 90
.4byte 753571 ; 91 .4byte 753571 @ 91
.4byte 778688 ; 92 .4byte 778688 @ 92
.4byte 804357 ; 93 .4byte 804357 @ 93
.4byte 830584 ; 94 .4byte 830584 @ 94
.4byte 857375 ; 95 .4byte 857375 @ 95
.4byte 884736 ; 96 .4byte 884736 @ 96
.4byte 912673 ; 97 .4byte 912673 @ 97
.4byte 941192 ; 98 .4byte 941192 @ 98
.4byte 970299 ; 99 .4byte 970299 @ 99
.4byte 1000000 ; 100 .4byte 1000000 @ 100
data/experience_tables/medium_slow_growth_rate.s
+101 -101
View File
@@ -1,101 +1,101 @@
.4byte 0 ; 0 .4byte 0 @ 0
.4byte 1 ; 1 .4byte 1 @ 1
.4byte 9 ; 2 .4byte 9 @ 2
.4byte 57 ; 3 .4byte 57 @ 3
.4byte 96 ; 4 .4byte 96 @ 4
.4byte 135 ; 5 .4byte 135 @ 5
.4byte 179 ; 6 .4byte 179 @ 6
.4byte 236 ; 7 .4byte 236 @ 7
.4byte 314 ; 8 .4byte 314 @ 8
.4byte 419 ; 9 .4byte 419 @ 9
.4byte 560 ; 10 .4byte 560 @ 10
.4byte 742 ; 11 .4byte 742 @ 11
.4byte 973 ; 12 .4byte 973 @ 12
.4byte 1261 ; 13 .4byte 1261 @ 13
.4byte 1612 ; 14 .4byte 1612 @ 14
.4byte 2035 ; 15 .4byte 2035 @ 15
.4byte 2535 ; 16 .4byte 2535 @ 16
.4byte 3120 ; 17 .4byte 3120 @ 17
.4byte 3798 ; 18 .4byte 3798 @ 18
.4byte 4575 ; 19 .4byte 4575 @ 19
.4byte 5460 ; 20 .4byte 5460 @ 20
.4byte 6458 ; 21 .4byte 6458 @ 21
.4byte 7577 ; 22 .4byte 7577 @ 22
.4byte 8825 ; 23 .4byte 8825 @ 23
.4byte 10208 ; 24 .4byte 10208 @ 24
.4byte 11735 ; 25 .4byte 11735 @ 25
.4byte 13411 ; 26 .4byte 13411 @ 26
.4byte 15244 ; 27 .4byte 15244 @ 27
.4byte 17242 ; 28 .4byte 17242 @ 28
.4byte 19411 ; 29 .4byte 19411 @ 29
.4byte 21760 ; 30 .4byte 21760 @ 30
.4byte 24294 ; 31 .4byte 24294 @ 31
.4byte 27021 ; 32 .4byte 27021 @ 32
.4byte 29949 ; 33 .4byte 29949 @ 33
.4byte 33084 ; 34 .4byte 33084 @ 34
.4byte 36435 ; 35 .4byte 36435 @ 35
.4byte 40007 ; 36 .4byte 40007 @ 36
.4byte 43808 ; 37 .4byte 43808 @ 37
.4byte 47846 ; 38 .4byte 47846 @ 38
.4byte 52127 ; 39 .4byte 52127 @ 39
.4byte 56660 ; 40 .4byte 56660 @ 40
.4byte 61450 ; 41 .4byte 61450 @ 41
.4byte 66505 ; 42 .4byte 66505 @ 42
.4byte 71833 ; 43 .4byte 71833 @ 43
.4byte 77440 ; 44 .4byte 77440 @ 44
.4byte 83335 ; 45 .4byte 83335 @ 45
.4byte 89523 ; 46 .4byte 89523 @ 46
.4byte 96012 ; 47 .4byte 96012 @ 47
.4byte 102810 ; 48 .4byte 102810 @ 48
.4byte 109923 ; 49 .4byte 109923 @ 49
.4byte 117360 ; 50 .4byte 117360 @ 50
.4byte 125126 ; 51 .4byte 125126 @ 51
.4byte 133229 ; 52 .4byte 133229 @ 52
.4byte 141677 ; 53 .4byte 141677 @ 53
.4byte 150476 ; 54 .4byte 150476 @ 54
.4byte 159635 ; 55 .4byte 159635 @ 55
.4byte 169159 ; 56 .4byte 169159 @ 56
.4byte 179056 ; 57 .4byte 179056 @ 57
.4byte 189334 ; 58 .4byte 189334 @ 58
.4byte 199999 ; 59 .4byte 199999 @ 59
.4byte 211060 ; 60 .4byte 211060 @ 60
.4byte 222522 ; 61 .4byte 222522 @ 61
.4byte 234393 ; 62 .4byte 234393 @ 62
.4byte 246681 ; 63 .4byte 246681 @ 63
.4byte 259392 ; 64 .4byte 259392 @ 64
.4byte 272535 ; 65 .4byte 272535 @ 65
.4byte 286115 ; 66 .4byte 286115 @ 66
.4byte 300140 ; 67 .4byte 300140 @ 67
.4byte 314618 ; 68 .4byte 314618 @ 68
.4byte 329555 ; 69 .4byte 329555 @ 69
.4byte 344960 ; 70 .4byte 344960 @ 70
.4byte 360838 ; 71 .4byte 360838 @ 71
.4byte 377197 ; 72 .4byte 377197 @ 72
.4byte 394045 ; 73 .4byte 394045 @ 73
.4byte 411388 ; 74 .4byte 411388 @ 74
.4byte 429235 ; 75 .4byte 429235 @ 75
.4byte 447591 ; 76 .4byte 447591 @ 76
.4byte 466464 ; 77 .4byte 466464 @ 77
.4byte 485862 ; 78 .4byte 485862 @ 78
.4byte 505791 ; 79 .4byte 505791 @ 79
.4byte 526260 ; 80 .4byte 526260 @ 80
.4byte 547274 ; 81 .4byte 547274 @ 81
.4byte 568841 ; 82 .4byte 568841 @ 82
.4byte 590969 ; 83 .4byte 590969 @ 83
.4byte 613664 ; 84 .4byte 613664 @ 84
.4byte 636935 ; 85 .4byte 636935 @ 85
.4byte 660787 ; 86 .4byte 660787 @ 86
.4byte 685228 ; 87 .4byte 685228 @ 87
.4byte 710266 ; 88 .4byte 710266 @ 88
.4byte 735907 ; 89 .4byte 735907 @ 89
.4byte 762160 ; 90 .4byte 762160 @ 90
.4byte 789030 ; 91 .4byte 789030 @ 91
.4byte 816525 ; 92 .4byte 816525 @ 92
.4byte 844653 ; 93 .4byte 844653 @ 93
.4byte 873420 ; 94 .4byte 873420 @ 94
.4byte 902835 ; 95 .4byte 902835 @ 95
.4byte 932903 ; 96 .4byte 932903 @ 96
.4byte 963632 ; 97 .4byte 963632 @ 97
.4byte 995030 ; 98 .4byte 995030 @ 98
.4byte 1027103 ; 99 .4byte 1027103 @ 99
.4byte 1059860 ; 100 .4byte 1059860 @ 100
data/experience_tables/slow_growth_rate.s
+101 -101
View File
@@ -1,101 +1,101 @@
.4byte 0 ; 0 .4byte 0 @ 0
.4byte 1 ; 1 .4byte 1 @ 1
.4byte 10 ; 2 .4byte 10 @ 2
.4byte 33 ; 3 .4byte 33 @ 3
.4byte 80 ; 4 .4byte 80 @ 4
.4byte 156 ; 5 .4byte 156 @ 5
.4byte 270 ; 6 .4byte 270 @ 6
.4byte 428 ; 7 .4byte 428 @ 7
.4byte 640 ; 8 .4byte 640 @ 8
.4byte 911 ; 9 .4byte 911 @ 9
.4byte 1250 ; 10 .4byte 1250 @ 10
.4byte 1663 ; 11 .4byte 1663 @ 11
.4byte 2160 ; 12 .4byte 2160 @ 12
.4byte 2746 ; 13 .4byte 2746 @ 13
.4byte 3430 ; 14 .4byte 3430 @ 14
.4byte 4218 ; 15 .4byte 4218 @ 15
.4byte 5120 ; 16 .4byte 5120 @ 16
.4byte 6141 ; 17 .4byte 6141 @ 17
.4byte 7290 ; 18 .4byte 7290 @ 18
.4byte 8573 ; 19 .4byte 8573 @ 19
.4byte 10000 ; 20 .4byte 10000 @ 20
.4byte 11576 ; 21 .4byte 11576 @ 21
.4byte 13310 ; 22 .4byte 13310 @ 22
.4byte 15208 ; 23 .4byte 15208 @ 23
.4byte 17280 ; 24 .4byte 17280 @ 24
.4byte 19531 ; 25 .4byte 19531 @ 25
.4byte 21970 ; 26 .4byte 21970 @ 26
.4byte 24603 ; 27 .4byte 24603 @ 27
.4byte 27440 ; 28 .4byte 27440 @ 28
.4byte 30486 ; 29 .4byte 30486 @ 29
.4byte 33750 ; 30 .4byte 33750 @ 30
.4byte 37238 ; 31 .4byte 37238 @ 31
.4byte 40960 ; 32 .4byte 40960 @ 32
.4byte 44921 ; 33 .4byte 44921 @ 33
.4byte 49130 ; 34 .4byte 49130 @ 34
.4byte 53593 ; 35 .4byte 53593 @ 35
.4byte 58320 ; 36 .4byte 58320 @ 36
.4byte 63316 ; 37 .4byte 63316 @ 37
.4byte 68590 ; 38 .4byte 68590 @ 38
.4byte 74148 ; 39 .4byte 74148 @ 39
.4byte 80000 ; 40 .4byte 80000 @ 40
.4byte 86151 ; 41 .4byte 86151 @ 41
.4byte 92610 ; 42 .4byte 92610 @ 42
.4byte 99383 ; 43 .4byte 99383 @ 43
.4byte 106480 ; 44 .4byte 106480 @ 44
.4byte 113906 ; 45 .4byte 113906 @ 45
.4byte 121670 ; 46 .4byte 121670 @ 46
.4byte 129778 ; 47 .4byte 129778 @ 47
.4byte 138240 ; 48 .4byte 138240 @ 48
.4byte 147061 ; 49 .4byte 147061 @ 49
.4byte 156250 ; 50 .4byte 156250 @ 50
.4byte 165813 ; 51 .4byte 165813 @ 51
.4byte 175760 ; 52 .4byte 175760 @ 52
.4byte 186096 ; 53 .4byte 186096 @ 53
.4byte 196830 ; 54 .4byte 196830 @ 54
.4byte 207968 ; 55 .4byte 207968 @ 55
.4byte 219520 ; 56 .4byte 219520 @ 56
.4byte 231491 ; 57 .4byte 231491 @ 57
.4byte 243890 ; 58 .4byte 243890 @ 58
.4byte 256723 ; 59 .4byte 256723 @ 59
.4byte 270000 ; 60 .4byte 270000 @ 60
.4byte 283726 ; 61 .4byte 283726 @ 61
.4byte 297910 ; 62 .4byte 297910 @ 62
.4byte 312558 ; 63 .4byte 312558 @ 63
.4byte 327680 ; 64 .4byte 327680 @ 64
.4byte 343281 ; 65 .4byte 343281 @ 65
.4byte 359370 ; 66 .4byte 359370 @ 66
.4byte 375953 ; 67 .4byte 375953 @ 67
.4byte 393040 ; 68 .4byte 393040 @ 68
.4byte 410636 ; 69 .4byte 410636 @ 69
.4byte 428750 ; 70 .4byte 428750 @ 70
.4byte 447388 ; 71 .4byte 447388 @ 71
.4byte 466560 ; 72 .4byte 466560 @ 72
.4byte 486271 ; 73 .4byte 486271 @ 73
.4byte 506530 ; 74 .4byte 506530 @ 74
.4byte 527343 ; 75 .4byte 527343 @ 75
.4byte 548720 ; 76 .4byte 548720 @ 76
.4byte 570666 ; 77 .4byte 570666 @ 77
.4byte 593190 ; 78 .4byte 593190 @ 78
.4byte 616298 ; 79 .4byte 616298 @ 79
.4byte 640000 ; 80 .4byte 640000 @ 80
.4byte 664301 ; 81 .4byte 664301 @ 81
.4byte 689210 ; 82 .4byte 689210 @ 82
.4byte 714733 ; 83 .4byte 714733 @ 83
.4byte 740880 ; 84 .4byte 740880 @ 84
.4byte 767656 ; 85 .4byte 767656 @ 85
.4byte 795070 ; 86 .4byte 795070 @ 86
.4byte 823128 ; 87 .4byte 823128 @ 87
.4byte 851840 ; 88 .4byte 851840 @ 88
.4byte 881211 ; 89 .4byte 881211 @ 89
.4byte 911250 ; 90 .4byte 911250 @ 90
.4byte 941963 ; 91 .4byte 941963 @ 91
.4byte 973360 ; 92 .4byte 973360 @ 92
.4byte 1005446 ; 93 .4byte 1005446 @ 93
.4byte 1038230 ; 94 .4byte 1038230 @ 94
.4byte 1071718 ; 95 .4byte 1071718 @ 95
.4byte 1105920 ; 96 .4byte 1105920 @ 96
.4byte 1140841 ; 97 .4byte 1140841 @ 97
.4byte 1176490 ; 98 .4byte 1176490 @ 98
.4byte 1212873 ; 99 .4byte 1212873 @ 99
.4byte 1250000 ; 100 .4byte 1250000 @ 100
data/field_effect_scripts.s
+68 -68
View File
@@ -1,6 +1,6 @@
.align 2, 0 .align 2, 0
gFieldEffectScriptPointers: ; 82DB9D4 gFieldEffectScriptPointers: @ 82DB9D4
.4byte gFieldEffectScript_ExclamationMarkIcon1 .4byte gFieldEffectScript_ExclamationMarkIcon1
.4byte gFieldEffectScript_UseCutOnTallGrass .4byte gFieldEffectScript_UseCutOnTallGrass
.4byte gFieldEffectScript_UseCutOnTree .4byte gFieldEffectScript_UseCutOnTree
@@ -69,273 +69,273 @@ gFieldEffectScriptPointers: ; 82DB9D4
.4byte gFieldEffectScript_Unknown65 .4byte gFieldEffectScript_Unknown65
.4byte gFieldEffectScript_Unknown66 .4byte gFieldEffectScript_Unknown66
gFieldEffectScript_ExclamationMarkIcon1: ; 82DBAE0 gFieldEffectScript_ExclamationMarkIcon1: @ 82DBAE0
field_eff_callnative oei_exclamation_mark field_eff_callnative oei_exclamation_mark
field_eff_end field_eff_end
gFieldEffectScript_UseCutOnTallGrass: ; 82DBAE6 gFieldEffectScript_UseCutOnTallGrass: @ 82DBAE6
field_eff_callnative sub_80D3A6C field_eff_callnative sub_80D3A6C
field_eff_end field_eff_end
gFieldEffectScript_UseCutOnTree: ; 82DBAEC gFieldEffectScript_UseCutOnTree: @ 82DBAEC
field_eff_callnative sub_80D3ABC field_eff_callnative sub_80D3ABC
field_eff_end field_eff_end
gFieldEffectScript_Shadow: ; 82DBAF2 gFieldEffectScript_Shadow: @ 82DBAF2
field_eff_callnative oei_shadow field_eff_callnative oei_shadow
field_eff_end field_eff_end
gFieldEffectScript_TallGrass: ; 82DBAF8 gFieldEffectScript_TallGrass: @ 82DBAF8
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, oei_grass_normal field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, oei_grass_normal
field_eff_end field_eff_end
gFieldEffectScript_Ripple: ; 82DBB02 gFieldEffectScript_Ripple: @ 82DBB02
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, oei_ripples field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, oei_ripples
field_eff_end field_eff_end
gFieldEffectScript_FieldMoveShowMon: ; 82DBB0C gFieldEffectScript_FieldMoveShowMon: @ 82DBB0C
field_eff_callnative sub_80B849C field_eff_callnative sub_80B849C
field_eff_end field_eff_end
gFieldEffectScript_Ash: ; 82DBB12 gFieldEffectScript_Ash: @ 82DBB12
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, oei_ash field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, oei_ash
field_eff_end field_eff_end
gFieldEffectScript_SurfBlob: ; 82DBB1C gFieldEffectScript_SurfBlob: @ 82DBB1C
field_eff_callnative sub_8155534 field_eff_callnative sub_8155534
field_eff_end field_eff_end
gFieldEffectScript_UseSurf: ; 82DBB22 gFieldEffectScript_UseSurf: @ 82DBB22
field_eff_callnative sub_80B8D44 field_eff_callnative sub_80B8D44
field_eff_end field_eff_end
gFieldEffectScript_GroundImpactDust: ; 82DBB28 gFieldEffectScript_GroundImpactDust: @ 82DBB28
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8155890 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8155890
field_eff_end field_eff_end
gFieldEffectScript_Unknown11: ; 82DBB32 gFieldEffectScript_Unknown11: @ 82DBB32
field_eff_callnative oei_sweet_scent field_eff_callnative oei_sweet_scent
field_eff_end field_eff_end
gFieldEffectScript_BikeHopTallGrass: ; 82DBB38 gFieldEffectScript_BikeHopTallGrass: @ 82DBB38
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_8154658 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_8154658
field_eff_end field_eff_end
gFieldEffectScript_SandFootprints: ; 82DBB42 gFieldEffectScript_SandFootprints: @ 82DBB42
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154B04 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154B04
field_eff_end field_eff_end
gFieldEffectScript_BikeHopBigSplash: ; 82DBB4C gFieldEffectScript_BikeHopBigSplash: @ 82DBB4C
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, oei_water_drop_tall field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, oei_water_drop_tall
field_eff_end field_eff_end
gFieldEffectScript_Splash: ; 82DBB56 gFieldEffectScript_Splash: @ 82DBB56
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154CEC field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154CEC
field_eff_end field_eff_end
gFieldEffectScript_BikeHopSmallSplash: ; 82DBB60 gFieldEffectScript_BikeHopSmallSplash: @ 82DBB60
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154E1C field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154E1C
field_eff_end field_eff_end
gFieldEffectScript_LongGrass: ; 82DBB6A gFieldEffectScript_LongGrass: @ 82DBB6A
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_8154758 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_8154758
field_eff_end field_eff_end
gFieldEffectScript_Unknown18: ; 82DBB74 gFieldEffectScript_Unknown18: @ 82DBB74
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_81548FC field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_81548FC
field_eff_end field_eff_end
gFieldEffectScript_Unknown19: ; 82DBB7E gFieldEffectScript_Unknown19: @ 82DBB7E
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_81551F0 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_81551F0
field_eff_end field_eff_end
gFieldEffectScript_Unknown20: ; 82DBB88 gFieldEffectScript_Unknown20: @ 82DBB88
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_815525C field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_815525C
field_eff_end field_eff_end
gFieldEffectScript_Unknown21: ; 82DBB92 gFieldEffectScript_Unknown21: @ 82DBB92
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_81552C8 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_81552C8
field_eff_end field_eff_end
gFieldEffectScript_Unknown22: ; 82DBB9C gFieldEffectScript_Unknown22: @ 82DBB9C
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8155334 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8155334
field_eff_end field_eff_end
gFieldEffectScript_BerryTreeGrowthSparkle: ; 82DBBA6 gFieldEffectScript_BerryTreeGrowthSparkle: @ 82DBBA6
field_eff_callnative sub_8155B2C field_eff_callnative sub_8155B2C
field_eff_end field_eff_end
gFieldEffectScript_DeepSandFootprints: ; 82DBBAC gFieldEffectScript_DeepSandFootprints: @ 82DBBAC
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154B78 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154B78
field_eff_end field_eff_end
gFieldEffectScript_Unknown25: ; 82DBBB6 gFieldEffectScript_Unknown25: @ 82DBBB6
field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4 field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_80B61A0 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_80B61A0
field_eff_end field_eff_end
gFieldEffectScript_Unknown26: ; 82DBBC5 gFieldEffectScript_Unknown26: @ 82DBBC5
field_eff_callnative sub_80FA208 field_eff_callnative sub_80FA208
field_eff_end field_eff_end
gFieldEffectScript_Unknown27: ; 82DBBCB gFieldEffectScript_Unknown27: @ 82DBBCB
field_eff_callnative sub_80FA36C field_eff_callnative sub_80FA36C
field_eff_end field_eff_end
gFieldEffectScript_TreeDisguise: ; 82DBBD1 gFieldEffectScript_TreeDisguise: @ 82DBBD1
field_eff_callnative ShowTreeDisguiseFieldEffect field_eff_callnative ShowTreeDisguiseFieldEffect
field_eff_end field_eff_end
gFieldEffectScript_MountainDisguise: ; 82DBBD7 gFieldEffectScript_MountainDisguise: @ 82DBBD7
field_eff_callnative ShowMountainDisguiseFieldEffect field_eff_callnative ShowMountainDisguiseFieldEffect
field_eff_end field_eff_end
gFieldEffectScript_Unknown30: ; 82DBBDD gFieldEffectScript_Unknown30: @ 82DBBDD
field_eff_callnative sub_80B90CC field_eff_callnative sub_80B90CC
field_eff_end field_eff_end
gFieldEffectScript_UseFly: ; 82DBBE3 gFieldEffectScript_UseFly: @ 82DBBE3
field_eff_callnative sub_80B91A4 field_eff_callnative sub_80B91A4
field_eff_end field_eff_end
gFieldEffectScript_FlyIn: ; 82DBBE9 gFieldEffectScript_FlyIn: @ 82DBBE9
field_eff_callnative sub_80B97C0 field_eff_callnative sub_80B97C0
field_eff_end field_eff_end
gFieldEffectScript_ExclamationMarkIcon2: ; 82DBBEF gFieldEffectScript_ExclamationMarkIcon2: @ 82DBBEF
field_eff_callnative sub_80B4658 field_eff_callnative sub_80B4658
field_eff_end field_eff_end
gFieldEffectScript_FeetInFlowingWater: ; 82DBBF5 gFieldEffectScript_FeetInFlowingWater: @ 82DBBF5
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154EFC field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154EFC
field_eff_end field_eff_end
gFieldEffectScript_BikeTireTracks: ; 82DBBFF gFieldEffectScript_BikeTireTracks: @ 82DBBFF
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154BEC field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154BEC
field_eff_end field_eff_end
gFieldEffectScript_SandDisguisePlaceholder: ; 82DBC09 gFieldEffectScript_SandDisguisePlaceholder: @ 82DBC09
field_eff_callnative ShowSandDisguiseFieldEffect field_eff_callnative ShowSandDisguiseFieldEffect
field_eff_end field_eff_end
gFieldEffectScript_UseRockSmash: ; 82DBC0F gFieldEffectScript_UseRockSmash: @ 82DBC0F
field_eff_callnative oei_rocksmash field_eff_callnative oei_rocksmash
field_eff_end field_eff_end
gFieldEffectScript_Unknown40: ; 82DBC15 gFieldEffectScript_Unknown40: @ 82DBC15
field_eff_callnative sub_8145E2C field_eff_callnative sub_8145E2C
field_eff_end field_eff_end
gFieldEffectScript_Unknown38: ; 82DBC1B gFieldEffectScript_Unknown38: @ 82DBC1B
field_eff_callnative sub_8135780 field_eff_callnative sub_8135780
field_eff_end field_eff_end
gFieldEffectScript_Unknown39: ; 82DBC21 gFieldEffectScript_Unknown39: @ 82DBC21
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8155900 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8155900
field_eff_end field_eff_end
gFieldEffectScript_ShortGrass: ; 82DBC2B gFieldEffectScript_ShortGrass: @ 82DBC2B
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_815496C field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_815496C
field_eff_end field_eff_end
gFieldEffectScript_HotSpringsWater: ; 82DBC35 gFieldEffectScript_HotSpringsWater: @ 82DBC35
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_81550B4 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_81550B4
field_eff_end field_eff_end
gFieldEffectScript_Unknown43: ; 82DBC3F gFieldEffectScript_Unknown43: @ 82DBC3F
field_eff_callnative oei_waterfall field_eff_callnative oei_waterfall
field_eff_end field_eff_end
gFieldEffectScript_Unknown44: ; 82DBC45 gFieldEffectScript_Unknown44: @ 82DBC45
field_eff_callnative sub_80B74D0 field_eff_callnative sub_80B74D0
field_eff_end field_eff_end
gFieldEffectScript_Unknown45: ; 82DBC4B gFieldEffectScript_Unknown45: @ 82DBC4B
field_eff_loadpal gFieldEffectObjectPaletteInfo10 field_eff_loadpal gFieldEffectObjectPaletteInfo10
field_eff_callnative sub_81470D0 field_eff_callnative sub_81470D0
field_eff_end field_eff_end
gFieldEffectScript_HeartIcon: ; 82DBC56 gFieldEffectScript_HeartIcon: @ 82DBC56
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_80B4690 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_80B4690
field_eff_end field_eff_end
gFieldEffectScript_Unknown47: ; 82DBC60 gFieldEffectScript_Unknown47: @ 82DBC60
field_eff_callnative sub_80FA6FC field_eff_callnative sub_80FA6FC
field_eff_end field_eff_end
gFieldEffectScript_Unknown48: ; 82DBC66 gFieldEffectScript_Unknown48: @ 82DBC66
field_eff_callnative sub_80FA700 field_eff_callnative sub_80FA700
field_eff_end field_eff_end
gFieldEffectScript_JumpOutOfAsh: ; 82DBC6C gFieldEffectScript_JumpOutOfAsh: @ 82DBC6C
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, sub_80B7C48 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, sub_80B7C48
field_eff_end field_eff_end
gFieldEffectScript_Unknown50: ; 82DBC76 gFieldEffectScript_Unknown50: @ 82DBC76
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, sub_80B79F4 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, sub_80B79F4
field_eff_end field_eff_end
gFieldEffectScript_Unknown51: ; 82DBC80 gFieldEffectScript_Unknown51: @ 82DBC80
field_eff_callnative sub_8159F2C field_eff_callnative sub_8159F2C
field_eff_end field_eff_end
gFieldEffectScript_Unknown52: ; 82DBC86 gFieldEffectScript_Unknown52: @ 82DBC86
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo9, sub_80FAA7C field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo9, sub_80FAA7C
field_eff_end field_eff_end
gFieldEffectScript_Bubbles: ; 82DBC90 gFieldEffectScript_Bubbles: @ 82DBC90
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8155A88 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8155A88
field_eff_end field_eff_end
gFieldEffectScript_Unknown54: ; 82DBC9A gFieldEffectScript_Unknown54: @ 82DBC9A
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo3, sub_8155DDC field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo3, sub_8155DDC
field_eff_end field_eff_end
gFieldEffectScript_Unknown55: ; 82DBCA4 gFieldEffectScript_Unknown55: @ 82DBCA4
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo7, sub_80FA13C field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo7, sub_80FA13C
field_eff_end field_eff_end
gFieldEffectScript_Unknown56: ; 82DBCAE gFieldEffectScript_Unknown56: @ 82DBCAE
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, sub_80FA248 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, sub_80FA248
field_eff_end field_eff_end
gFieldEffectScript_Unknown57: ; 82DBCB8 gFieldEffectScript_Unknown57: @ 82DBCB8
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, sub_80FA3AC field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, sub_80FA3AC
field_eff_end field_eff_end
gFieldEffectScript_Unknown58: ; 82DBCC2 gFieldEffectScript_Unknown58: @ 82DBCC2
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, sub_80D3B00 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, sub_80D3B00
field_eff_end field_eff_end
gFieldEffectScript_FieldMoveShowMonInit: ; 82DBCCC gFieldEffectScript_FieldMoveShowMonInit: @ 82DBCCC
field_eff_callnative sub_80B84F8 field_eff_callnative sub_80B84F8
field_eff_end field_eff_end
gFieldEffectScript_Unknown60: ; 82DBCD2 gFieldEffectScript_Unknown60: @ 82DBCD2
field_eff_callnative sub_81799B8 field_eff_callnative sub_81799B8
field_eff_end field_eff_end
gFieldEffectScript_Unknown61: ; 82DBCD8 gFieldEffectScript_Unknown61: @ 82DBCD8
field_eff_callnative sub_80FA458 field_eff_callnative sub_80FA458
field_eff_end field_eff_end
gFieldEffectScript_Unknown62: ; 82DBCDE gFieldEffectScript_Unknown62: @ 82DBCDE
field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4 field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo5, sub_80B62F4 field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo5, sub_80B62F4
field_eff_end field_eff_end
gFieldEffectScript_Unknown63: ; 82DBCED gFieldEffectScript_Unknown63: @ 82DBCED
field_eff_callnative sub_817C91C field_eff_callnative sub_817C91C
field_eff_end field_eff_end
gFieldEffectScript_Rayquaza: ; 82DBCF3 gFieldEffectScript_Rayquaza: @ 82DBCF3
field_eff_callnative sub_80B8F98 field_eff_callnative sub_80B8F98
field_eff_end field_eff_end
gFieldEffectScript_Unknown65: ; 82DBCF9 gFieldEffectScript_Unknown65: @ 82DBCF9
field_eff_callnative sub_80B9ADC field_eff_callnative sub_80B9ADC
field_eff_end field_eff_end
gFieldEffectScript_Unknown66: ; 82DBCFF gFieldEffectScript_Unknown66: @ 82DBCFF
field_eff_callnative sub_80B9E28 field_eff_callnative sub_80B9E28
field_eff_end field_eff_end
data/graphics/berries/berry_graphics.s
+86 -86
View File
@@ -1,429 +1,429 @@
.align 2, 0 .align 2, 0
gBerryPic_Cheri: ; 8D9C3A8 gBerryPic_Cheri: @ 8D9C3A8
.incbin "data/graphics/berries/pics/cheri.4bpp.lz" .incbin "data/graphics/berries/pics/cheri.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Oran: ; 8D9C4FC gBerryPic_Oran: @ 8D9C4FC
.incbin "data/graphics/berries/pics/oran.4bpp.lz" .incbin "data/graphics/berries/pics/oran.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Pecha: ; 8D9C670 gBerryPic_Pecha: @ 8D9C670
.incbin "data/graphics/berries/pics/pecha.4bpp.lz" .incbin "data/graphics/berries/pics/pecha.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Rawst: ; 8D9C7E4 gBerryPic_Rawst: @ 8D9C7E4
.incbin "data/graphics/berries/pics/rawst.4bpp.lz" .incbin "data/graphics/berries/pics/rawst.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Aspear: ; 8D9C97C gBerryPic_Aspear: @ 8D9C97C
.incbin "data/graphics/berries/pics/aspear.4bpp.lz" .incbin "data/graphics/berries/pics/aspear.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Leppa: ; 8D9CB24 gBerryPic_Leppa: @ 8D9CB24
.incbin "data/graphics/berries/pics/leppa.4bpp.lz" .incbin "data/graphics/berries/pics/leppa.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Chesto: ; 8D9CC94 gBerryPic_Chesto: @ 8D9CC94
.incbin "data/graphics/berries/pics/chesto.4bpp.lz" .incbin "data/graphics/berries/pics/chesto.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Persim: ; 8D9CE78 gBerryPic_Persim: @ 8D9CE78
.incbin "data/graphics/berries/pics/persim.4bpp.lz" .incbin "data/graphics/berries/pics/persim.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Lum: ; 8D9CFC8 gBerryPic_Lum: @ 8D9CFC8
.incbin "data/graphics/berries/pics/lum.4bpp.lz" .incbin "data/graphics/berries/pics/lum.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Sitrus: ; 8D9D0E4 gBerryPic_Sitrus: @ 8D9D0E4
.incbin "data/graphics/berries/pics/sitrus.4bpp.lz" .incbin "data/graphics/berries/pics/sitrus.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Figy: ; 8D9D288 gBerryPic_Figy: @ 8D9D288
.incbin "data/graphics/berries/pics/figy.4bpp.lz" .incbin "data/graphics/berries/pics/figy.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Wiki: ; 8D9D434 gBerryPic_Wiki: @ 8D9D434
.incbin "data/graphics/berries/pics/wiki.4bpp.lz" .incbin "data/graphics/berries/pics/wiki.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Mago: ; 8D9D628 gBerryPic_Mago: @ 8D9D628
.incbin "data/graphics/berries/pics/mago.4bpp.lz" .incbin "data/graphics/berries/pics/mago.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Aguav: ; 8D9D7DC gBerryPic_Aguav: @ 8D9D7DC
.incbin "data/graphics/berries/pics/aguav.4bpp.lz" .incbin "data/graphics/berries/pics/aguav.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Iapapa: ; 8D9D950 gBerryPic_Iapapa: @ 8D9D950
.incbin "data/graphics/berries/pics/iapapa.4bpp.lz" .incbin "data/graphics/berries/pics/iapapa.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Razz: ; 8D9DC08 gBerryPic_Razz: @ 8D9DC08
.incbin "data/graphics/berries/pics/razz.4bpp.lz" .incbin "data/graphics/berries/pics/razz.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Bluk: ; 8D9DE38 gBerryPic_Bluk: @ 8D9DE38
.incbin "data/graphics/berries/pics/bluk.4bpp.lz" .incbin "data/graphics/berries/pics/bluk.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Nanab: ; 8D9E020 gBerryPic_Nanab: @ 8D9E020
.incbin "data/graphics/berries/pics/nanab.4bpp.lz" .incbin "data/graphics/berries/pics/nanab.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Wepear: ; 8D9E194 gBerryPic_Wepear: @ 8D9E194
.incbin "data/graphics/berries/pics/wepear.4bpp.lz" .incbin "data/graphics/berries/pics/wepear.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Pinap: ; 8D9E35C gBerryPic_Pinap: @ 8D9E35C
.incbin "data/graphics/berries/pics/pinap.4bpp.lz" .incbin "data/graphics/berries/pics/pinap.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Pomeg: ; 8D9E570 gBerryPic_Pomeg: @ 8D9E570
.incbin "data/graphics/berries/pics/pomeg.4bpp.lz" .incbin "data/graphics/berries/pics/pomeg.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Kelpsy: ; 8D9E718 gBerryPic_Kelpsy: @ 8D9E718
.incbin "data/graphics/berries/pics/kelpsy.4bpp.lz" .incbin "data/graphics/berries/pics/kelpsy.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Qualot: ; 8D9E8C0 gBerryPic_Qualot: @ 8D9E8C0
.incbin "data/graphics/berries/pics/qualot.4bpp.lz" .incbin "data/graphics/berries/pics/qualot.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Hondew: ; 8D9EA8C gBerryPic_Hondew: @ 8D9EA8C
.incbin "data/graphics/berries/pics/hondew.4bpp.lz" .incbin "data/graphics/berries/pics/hondew.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Grepa: ; 8D9ECE4 gBerryPic_Grepa: @ 8D9ECE4
.incbin "data/graphics/berries/pics/grepa.4bpp.lz" .incbin "data/graphics/berries/pics/grepa.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Tamato: ; 8D9EE74 gBerryPic_Tamato: @ 8D9EE74
.incbin "data/graphics/berries/pics/tamato.4bpp.lz" .incbin "data/graphics/berries/pics/tamato.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Cornn: ; 8D9F138 gBerryPic_Cornn: @ 8D9F138
.incbin "data/graphics/berries/pics/cornn.4bpp.lz" .incbin "data/graphics/berries/pics/cornn.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Magost: ; 8D9F33C gBerryPic_Magost: @ 8D9F33C
.incbin "data/graphics/berries/pics/magost.4bpp.lz" .incbin "data/graphics/berries/pics/magost.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Rabuta: ; 8D9F4E0 gBerryPic_Rabuta: @ 8D9F4E0
.incbin "data/graphics/berries/pics/rabuta.4bpp.lz" .incbin "data/graphics/berries/pics/rabuta.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Nomel: ; 8D9F7D4 gBerryPic_Nomel: @ 8D9F7D4
.incbin "data/graphics/berries/pics/nomel.4bpp.lz" .incbin "data/graphics/berries/pics/nomel.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Spelon: ; 8D9F9B0 gBerryPic_Spelon: @ 8D9F9B0
.incbin "data/graphics/berries/pics/spelon.4bpp.lz" .incbin "data/graphics/berries/pics/spelon.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Pamtre: ; 8D9FBA0 gBerryPic_Pamtre: @ 8D9FBA0
.incbin "data/graphics/berries/pics/pamtre.4bpp.lz" .incbin "data/graphics/berries/pics/pamtre.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Watmel: ; 8D9FDF0 gBerryPic_Watmel: @ 8D9FDF0
.incbin "data/graphics/berries/pics/watmel.4bpp.lz" .incbin "data/graphics/berries/pics/watmel.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Durin: ; 8DA00D4 gBerryPic_Durin: @ 8DA00D4
.incbin "data/graphics/berries/pics/durin.4bpp.lz" .incbin "data/graphics/berries/pics/durin.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Belue: ; 8DA04A0 gBerryPic_Belue: @ 8DA04A0
.incbin "data/graphics/berries/pics/belue.4bpp.lz" .incbin "data/graphics/berries/pics/belue.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Liechi: ; 8DA0778 gBerryPic_Liechi: @ 8DA0778
.incbin "data/graphics/berries/pics/liechi.4bpp.lz" .incbin "data/graphics/berries/pics/liechi.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Ganlon: ; 8DA09D0 gBerryPic_Ganlon: @ 8DA09D0
.incbin "data/graphics/berries/pics/ganlon.4bpp.lz" .incbin "data/graphics/berries/pics/ganlon.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Salac: ; 8DA0B68 gBerryPic_Salac: @ 8DA0B68
.incbin "data/graphics/berries/pics/salac.4bpp.lz" .incbin "data/graphics/berries/pics/salac.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Petaya: ; 8DA0DAC gBerryPic_Petaya: @ 8DA0DAC
.incbin "data/graphics/berries/pics/petaya.4bpp.lz" .incbin "data/graphics/berries/pics/petaya.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Apicot: ; 8DA1054 gBerryPic_Apicot: @ 8DA1054
.incbin "data/graphics/berries/pics/apicot.4bpp.lz" .incbin "data/graphics/berries/pics/apicot.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Lansat: ; 8DA11E4 gBerryPic_Lansat: @ 8DA11E4
.incbin "data/graphics/berries/pics/lansat.4bpp.lz" .incbin "data/graphics/berries/pics/lansat.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Starf: ; 8DA13D8 gBerryPic_Starf: @ 8DA13D8
.incbin "data/graphics/berries/pics/starf.4bpp.lz" .incbin "data/graphics/berries/pics/starf.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPic_Enigma: ; 8DA15A8 gBerryPic_Enigma: @ 8DA15A8
.incbin "data/graphics/berries/pics/enigma.4bpp.lz" .incbin "data/graphics/berries/pics/enigma.4bpp.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Cheri: ; 8DA17C0 gBerryPalette_Cheri: @ 8DA17C0
.incbin "data/graphics/berries/palettes/cheri.gbapal.lz" .incbin "data/graphics/berries/palettes/cheri.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Oran: ; 8DA17E8 gBerryPalette_Oran: @ 8DA17E8
.incbin "data/graphics/berries/palettes/oran.gbapal.lz" .incbin "data/graphics/berries/palettes/oran.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Pecha: ; 8DA1810 gBerryPalette_Pecha: @ 8DA1810
.incbin "data/graphics/berries/palettes/pecha.gbapal.lz" .incbin "data/graphics/berries/palettes/pecha.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Rawst: ; 8DA1838 gBerryPalette_Rawst: @ 8DA1838
.incbin "data/graphics/berries/palettes/rawst.gbapal.lz" .incbin "data/graphics/berries/palettes/rawst.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Aspear: ; 8DA1860 gBerryPalette_Aspear: @ 8DA1860
.incbin "data/graphics/berries/palettes/aspear.gbapal.lz" .incbin "data/graphics/berries/palettes/aspear.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Leppa: ; 8DA1888 gBerryPalette_Leppa: @ 8DA1888
.incbin "data/graphics/berries/palettes/leppa.gbapal.lz" .incbin "data/graphics/berries/palettes/leppa.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Chesto: ; 8DA18B0 gBerryPalette_Chesto: @ 8DA18B0
.incbin "data/graphics/berries/palettes/chesto.gbapal.lz" .incbin "data/graphics/berries/palettes/chesto.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Persim: ; 8DA18D8 gBerryPalette_Persim: @ 8DA18D8
.incbin "data/graphics/berries/palettes/persim.gbapal.lz" .incbin "data/graphics/berries/palettes/persim.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Lum: ; 8DA1900 gBerryPalette_Lum: @ 8DA1900
.incbin "data/graphics/berries/palettes/lum.gbapal.lz" .incbin "data/graphics/berries/palettes/lum.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Sitrus: ; 8DA1928 gBerryPalette_Sitrus: @ 8DA1928
.incbin "data/graphics/berries/palettes/sitrus.gbapal.lz" .incbin "data/graphics/berries/palettes/sitrus.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Figy: ; 8DA1950 gBerryPalette_Figy: @ 8DA1950
.incbin "data/graphics/berries/palettes/figy.gbapal.lz" .incbin "data/graphics/berries/palettes/figy.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Wiki: ; 8DA1978 gBerryPalette_Wiki: @ 8DA1978
.incbin "data/graphics/berries/palettes/wiki.gbapal.lz" .incbin "data/graphics/berries/palettes/wiki.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Mago: ; 8DA19A0 gBerryPalette_Mago: @ 8DA19A0
.incbin "data/graphics/berries/palettes/mago.gbapal.lz" .incbin "data/graphics/berries/palettes/mago.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Aguav: ; 8DA19C8 gBerryPalette_Aguav: @ 8DA19C8
.incbin "data/graphics/berries/palettes/aguav.gbapal.lz" .incbin "data/graphics/berries/palettes/aguav.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Iapapa: ; 8DA19F0 gBerryPalette_Iapapa: @ 8DA19F0
.incbin "data/graphics/berries/palettes/iapapa.gbapal.lz" .incbin "data/graphics/berries/palettes/iapapa.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Razz: ; 8DA1A18 gBerryPalette_Razz: @ 8DA1A18
.incbin "data/graphics/berries/palettes/razz.gbapal.lz" .incbin "data/graphics/berries/palettes/razz.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Bluk: ; 8DA1A40 gBerryPalette_Bluk: @ 8DA1A40
.incbin "data/graphics/berries/palettes/bluk.gbapal.lz" .incbin "data/graphics/berries/palettes/bluk.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Nanab: ; 8DA1A68 gBerryPalette_Nanab: @ 8DA1A68
.incbin "data/graphics/berries/palettes/nanab.gbapal.lz" .incbin "data/graphics/berries/palettes/nanab.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Wepear: ; 8DA1A90 gBerryPalette_Wepear: @ 8DA1A90
.incbin "data/graphics/berries/palettes/wepear.gbapal.lz" .incbin "data/graphics/berries/palettes/wepear.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Pinap: ; 8DA1AB8 gBerryPalette_Pinap: @ 8DA1AB8
.incbin "data/graphics/berries/palettes/pinap.gbapal.lz" .incbin "data/graphics/berries/palettes/pinap.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Pomeg: ; 8DA1AE0 gBerryPalette_Pomeg: @ 8DA1AE0
.incbin "data/graphics/berries/palettes/pomeg.gbapal.lz" .incbin "data/graphics/berries/palettes/pomeg.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Kelpsy: ; 8DA1B08 gBerryPalette_Kelpsy: @ 8DA1B08
.incbin "data/graphics/berries/palettes/kelpsy.gbapal.lz" .incbin "data/graphics/berries/palettes/kelpsy.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Qualot: ; 8DA1B30 gBerryPalette_Qualot: @ 8DA1B30
.incbin "data/graphics/berries/palettes/qualot.gbapal.lz" .incbin "data/graphics/berries/palettes/qualot.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Hondew: ; 8DA1B58 gBerryPalette_Hondew: @ 8DA1B58
.incbin "data/graphics/berries/palettes/hondew.gbapal.lz" .incbin "data/graphics/berries/palettes/hondew.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Grepa: ; 8DA1B80 gBerryPalette_Grepa: @ 8DA1B80
.incbin "data/graphics/berries/palettes/grepa.gbapal.lz" .incbin "data/graphics/berries/palettes/grepa.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Tamato: ; 8DA1BA8 gBerryPalette_Tamato: @ 8DA1BA8
.incbin "data/graphics/berries/palettes/tamato.gbapal.lz" .incbin "data/graphics/berries/palettes/tamato.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Cornn: ; 8DA1BD0 gBerryPalette_Cornn: @ 8DA1BD0
.incbin "data/graphics/berries/palettes/cornn.gbapal.lz" .incbin "data/graphics/berries/palettes/cornn.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Magost: ; 8DA1BF8 gBerryPalette_Magost: @ 8DA1BF8
.incbin "data/graphics/berries/palettes/magost.gbapal.lz" .incbin "data/graphics/berries/palettes/magost.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Rabuta: ; 8DA1C20 gBerryPalette_Rabuta: @ 8DA1C20
.incbin "data/graphics/berries/palettes/rabuta.gbapal.lz" .incbin "data/graphics/berries/palettes/rabuta.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Nomel: ; 8DA1C48 gBerryPalette_Nomel: @ 8DA1C48
.incbin "data/graphics/berries/palettes/nomel.gbapal.lz" .incbin "data/graphics/berries/palettes/nomel.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Spelon: ; 8DA1C70 gBerryPalette_Spelon: @ 8DA1C70
.incbin "data/graphics/berries/palettes/spelon.gbapal.lz" .incbin "data/graphics/berries/palettes/spelon.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Pamtre: ; 8DA1C98 gBerryPalette_Pamtre: @ 8DA1C98
.incbin "data/graphics/berries/palettes/pamtre.gbapal.lz" .incbin "data/graphics/berries/palettes/pamtre.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Watmel: ; 8DA1CC0 gBerryPalette_Watmel: @ 8DA1CC0
.incbin "data/graphics/berries/palettes/watmel.gbapal.lz" .incbin "data/graphics/berries/palettes/watmel.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Durin: ; 8DA1CE8 gBerryPalette_Durin: @ 8DA1CE8
.incbin "data/graphics/berries/palettes/durin.gbapal.lz" .incbin "data/graphics/berries/palettes/durin.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Belue: ; 8DA1D10 gBerryPalette_Belue: @ 8DA1D10
.incbin "data/graphics/berries/palettes/belue.gbapal.lz" .incbin "data/graphics/berries/palettes/belue.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Liechi: ; 8DA1D38 gBerryPalette_Liechi: @ 8DA1D38
.incbin "data/graphics/berries/palettes/liechi.gbapal.lz" .incbin "data/graphics/berries/palettes/liechi.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Ganlon: ; 8DA1D60 gBerryPalette_Ganlon: @ 8DA1D60
.incbin "data/graphics/berries/palettes/ganlon.gbapal.lz" .incbin "data/graphics/berries/palettes/ganlon.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Salac: ; 8DA1D88 gBerryPalette_Salac: @ 8DA1D88
.incbin "data/graphics/berries/palettes/salac.gbapal.lz" .incbin "data/graphics/berries/palettes/salac.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Petaya: ; 8DA1DB0 gBerryPalette_Petaya: @ 8DA1DB0
.incbin "data/graphics/berries/palettes/petaya.gbapal.lz" .incbin "data/graphics/berries/palettes/petaya.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Apicot: ; 8DA1DD8 gBerryPalette_Apicot: @ 8DA1DD8
.incbin "data/graphics/berries/palettes/apicot.gbapal.lz" .incbin "data/graphics/berries/palettes/apicot.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Lansat: ; 8DA1E00 gBerryPalette_Lansat: @ 8DA1E00
.incbin "data/graphics/berries/palettes/lansat.gbapal.lz" .incbin "data/graphics/berries/palettes/lansat.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Starf: ; 8DA1E28 gBerryPalette_Starf: @ 8DA1E28
.incbin "data/graphics/berries/palettes/starf.gbapal.lz" .incbin "data/graphics/berries/palettes/starf.gbapal.lz"
.align 2, 0 .align 2, 0
gBerryPalette_Enigma: ; 8DA1E50 gBerryPalette_Enigma: @ 8DA1E50
.incbin "data/graphics/berries/palettes/enigma.gbapal.lz" .incbin "data/graphics/berries/palettes/enigma.gbapal.lz"
data/graphics/berries/berry_pic_table.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0 .align 2, 0
gBerryPicTable: ; 857FC94 gBerryPicTable: @ 857FC94
.4byte gBerryPic_Cheri, gBerryPalette_Cheri .4byte gBerryPic_Cheri, gBerryPalette_Cheri
.4byte gBerryPic_Chesto, gBerryPalette_Chesto .4byte gBerryPic_Chesto, gBerryPalette_Chesto
.4byte gBerryPic_Pecha, gBerryPalette_Pecha .4byte gBerryPic_Pecha, gBerryPalette_Pecha
data/graphics/field_objects/berry_tree_graphics_tables.s
+194 -194
View File
@@ -1,6 +1,6 @@
.align 2, 0 .align 2, 0
gFieldObjectPicTable_PechaBerryTree: ; 850BE48 gFieldObjectPicTable_PechaBerryTree: @ 850BE48
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -13,12 +13,12 @@ gFieldObjectPicTable_PechaBerryTree: ; 850BE48
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Pecha: ; 850BE90 gBerryTreePaletteSlotTable_Pecha: @ 850BE90
berry_tree_palette_slot_table 4 berry_tree_palette_slot_table 4
.align 2, 0 .align 2, 0
gFieldObjectPicTable_KelpsyBerryTree: ; 850BE98 gFieldObjectPicTable_KelpsyBerryTree: @ 850BE98
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -31,12 +31,12 @@ gFieldObjectPicTable_KelpsyBerryTree: ; 850BE98
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Kelpsy: ; 850BEE0 gBerryTreePaletteSlotTable_Kelpsy: @ 850BEE0
berry_tree_palette_slot_table 2 berry_tree_palette_slot_table 2
.align 2, 0 .align 2, 0
gFieldObjectPicTable_WepearBerryTree: ; 850BEE8 gFieldObjectPicTable_WepearBerryTree: @ 850BEE8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -49,12 +49,12 @@ gFieldObjectPicTable_WepearBerryTree: ; 850BEE8
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Wepear: ; 850BF30 gBerryTreePaletteSlotTable_Wepear: @ 850BF30
berry_tree_palette_slot_table 2 berry_tree_palette_slot_table 2
.align 2, 0 .align 2, 0
gFieldObjectPicTable_IapapaBerryTree: ; 850BF38 gFieldObjectPicTable_IapapaBerryTree: @ 850BF38
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -67,12 +67,12 @@ gFieldObjectPicTable_IapapaBerryTree: ; 850BF38
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Iapapa: ; 850BF80 gBerryTreePaletteSlotTable_Iapapa: @ 850BF80
berry_tree_palette_slot_table 3 berry_tree_palette_slot_table 3
.align 2, 0 .align 2, 0
gFieldObjectPicTable_CheriBerryTree: ; 850BF88 gFieldObjectPicTable_CheriBerryTree: @ 850BF88
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -85,12 +85,12 @@ gFieldObjectPicTable_CheriBerryTree: ; 850BF88
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Cheri: ; 850BFD0 gBerryTreePaletteSlotTable_Cheri: @ 850BFD0
berry_tree_palette_slot_table 4 berry_tree_palette_slot_table 4
.align 2, 0 .align 2, 0
gFieldObjectPicTable_FigyBerryTree: ; 850BFD8 gFieldObjectPicTable_FigyBerryTree: @ 850BFD8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -103,12 +103,12 @@ gFieldObjectPicTable_FigyBerryTree: ; 850BFD8
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Figy: ; 850C020 gBerryTreePaletteSlotTable_Figy: @ 850C020
berry_tree_palette_slot_table 3 berry_tree_palette_slot_table 3
.align 2, 0 .align 2, 0
gFieldObjectPicTable_MagoBerryTree: ; 850C028 gFieldObjectPicTable_MagoBerryTree: @ 850C028
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -121,12 +121,12 @@ gFieldObjectPicTable_MagoBerryTree: ; 850C028
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Mago: ; 850C070 gBerryTreePaletteSlotTable_Mago: @ 850C070
berry_tree_palette_slot_table 3 berry_tree_palette_slot_table 3
.align 2, 0 .align 2, 0
gFieldObjectPicTable_LumBerryTree: ; 850C078 gFieldObjectPicTable_LumBerryTree: @ 850C078
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -139,12 +139,12 @@ gFieldObjectPicTable_LumBerryTree: ; 850C078
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Lum: ; 850C0C0 gBerryTreePaletteSlotTable_Lum: @ 850C0C0
berry_tree_palette_slot_table 4 berry_tree_palette_slot_table 4
.align 2, 0 .align 2, 0
gFieldObjectPicTable_RazzBerryTree: ; 850C0C8 gFieldObjectPicTable_RazzBerryTree: @ 850C0C8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -157,12 +157,12 @@ gFieldObjectPicTable_RazzBerryTree: ; 850C0C8
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Razz: ; 850C110 gBerryTreePaletteSlotTable_Razz: @ 850C110
berry_tree_palette_slot_table 4 berry_tree_palette_slot_table 4
.align 2, 0 .align 2, 0
gFieldObjectPicTable_GrepaBerryTree: ; 850C118 gFieldObjectPicTable_GrepaBerryTree: @ 850C118
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -175,12 +175,12 @@ gFieldObjectPicTable_GrepaBerryTree: ; 850C118
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Grepa: ; 850C160 gBerryTreePaletteSlotTable_Grepa: @ 850C160
berry_tree_palette_slot_table 3 berry_tree_palette_slot_table 3
.align 2, 0 .align 2, 0
gFieldObjectPicTable_RabutaBerryTree: ; 850C168 gFieldObjectPicTable_RabutaBerryTree: @ 850C168
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -193,12 +193,12 @@ gFieldObjectPicTable_RabutaBerryTree: ; 850C168
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Rabuta: ; 850C1B0 gBerryTreePaletteSlotTable_Rabuta: @ 850C1B0
berry_tree_palette_slot_table 4 berry_tree_palette_slot_table 4
.align 2, 0 .align 2, 0
gFieldObjectPicTable_NomelBerryTree: ; 850C1B8 gFieldObjectPicTable_NomelBerryTree: @ 850C1B8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -211,12 +211,12 @@ gFieldObjectPicTable_NomelBerryTree: ; 850C1B8
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Nomel: ; 850C200 gBerryTreePaletteSlotTable_Nomel: @ 850C200
berry_tree_palette_slot_table 3 berry_tree_palette_slot_table 3
.align 2, 0 .align 2, 0
gFieldObjectPicTable_LeppaBerryTree: ; 850C208 gFieldObjectPicTable_LeppaBerryTree: @ 850C208
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -229,12 +229,12 @@ gFieldObjectPicTable_LeppaBerryTree: ; 850C208
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Leppa: ; 850C250 gBerryTreePaletteSlotTable_Leppa: @ 850C250
berry_tree_palette_slot_table 3 berry_tree_palette_slot_table 3
.align 2, 0 .align 2, 0
gFieldObjectPicTable_LiechiBerryTree: ; 850C258 gFieldObjectPicTable_LiechiBerryTree: @ 850C258
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -247,12 +247,12 @@ gFieldObjectPicTable_LiechiBerryTree: ; 850C258
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Liechi: ; 850C2A0 gBerryTreePaletteSlotTable_Liechi: @ 850C2A0
berry_tree_palette_slot_table 4 berry_tree_palette_slot_table 4
.align 2, 0 .align 2, 0
gFieldObjectPicTable_HondewBerryTree: ; 850C2A8 gFieldObjectPicTable_HondewBerryTree: @ 850C2A8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -265,12 +265,12 @@ gFieldObjectPicTable_HondewBerryTree: ; 850C2A8
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Hondew: ; 850C2F0 gBerryTreePaletteSlotTable_Hondew: @ 850C2F0
berry_tree_palette_slot_table 5 berry_tree_palette_slot_table 5
.align 2, 0 .align 2, 0
gFieldObjectPicTable_AguavBerryTree: ; 850C2F8 gFieldObjectPicTable_AguavBerryTree: @ 850C2F8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -283,12 +283,12 @@ gFieldObjectPicTable_AguavBerryTree: ; 850C2F8
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Aguav: ; 850C340 gBerryTreePaletteSlotTable_Aguav: @ 850C340
berry_tree_palette_slot_table 4 berry_tree_palette_slot_table 4
.align 2, 0 .align 2, 0
gFieldObjectPicTable_WikiBerryTree: ; 850C348 gFieldObjectPicTable_WikiBerryTree: @ 850C348
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -301,12 +301,12 @@ gFieldObjectPicTable_WikiBerryTree: ; 850C348
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Wiki: ; 850C390 gBerryTreePaletteSlotTable_Wiki: @ 850C390
berry_tree_palette_slot_table 3 berry_tree_palette_slot_table 3
.align 2, 0 .align 2, 0
gFieldObjectPicTable_PomegBerryTree: ; 850C398 gFieldObjectPicTable_PomegBerryTree: @ 850C398
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -319,12 +319,12 @@ gFieldObjectPicTable_PomegBerryTree: ; 850C398
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Pomeg: ; 850C3E0 gBerryTreePaletteSlotTable_Pomeg: @ 850C3E0
berry_tree_palette_slot_table 3 berry_tree_palette_slot_table 3
.align 2, 0 .align 2, 0
gFieldObjectPicTable_RawstBerryTree: ; 850C3E8 gFieldObjectPicTable_RawstBerryTree: @ 850C3E8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -337,12 +337,12 @@ gFieldObjectPicTable_RawstBerryTree: ; 850C3E8
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Rawst: ; 850C430 gBerryTreePaletteSlotTable_Rawst: @ 850C430
berry_tree_palette_slot_table 4 berry_tree_palette_slot_table 4
.align 2, 0 .align 2, 0
gFieldObjectPicTable_SpelonBerryTree: ; 850C438 gFieldObjectPicTable_SpelonBerryTree: @ 850C438
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -355,12 +355,12 @@ gFieldObjectPicTable_SpelonBerryTree: ; 850C438
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Spelon: ; 850C480 gBerryTreePaletteSlotTable_Spelon: @ 850C480
berry_tree_palette_slot_table 3 berry_tree_palette_slot_table 3
.align 2, 0 .align 2, 0
gFieldObjectPicTable_ChestoBerryTree: ; 850C488 gFieldObjectPicTable_ChestoBerryTree: @ 850C488
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -373,12 +373,12 @@ gFieldObjectPicTable_ChestoBerryTree: ; 850C488
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Chesto: ; 850C4D0 gBerryTreePaletteSlotTable_Chesto: @ 850C4D0
berry_tree_palette_slot_table 2 berry_tree_palette_slot_table 2
.align 2, 0 .align 2, 0
gFieldObjectPicTable_OranBerryTree: ; 850C4D8 gFieldObjectPicTable_OranBerryTree: @ 850C4D8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -391,12 +391,12 @@ gFieldObjectPicTable_OranBerryTree: ; 850C4D8
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Oran: ; 850C520 gBerryTreePaletteSlotTable_Oran: @ 850C520
berry_tree_palette_slot_table 2 berry_tree_palette_slot_table 2
.align 2, 0 .align 2, 0
gFieldObjectPicTable_PersimBerryTree: ; 850C528 gFieldObjectPicTable_PersimBerryTree: @ 850C528
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -409,12 +409,12 @@ gFieldObjectPicTable_PersimBerryTree: ; 850C528
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Persim: ; 850C570 gBerryTreePaletteSlotTable_Persim: @ 850C570
berry_tree_palette_slot_table 2 berry_tree_palette_slot_table 2
.align 2, 0 .align 2, 0
gFieldObjectPicTable_SitrusBerryTree: ; 850C578 gFieldObjectPicTable_SitrusBerryTree: @ 850C578
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -427,12 +427,12 @@ gFieldObjectPicTable_SitrusBerryTree: ; 850C578
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Sitrus: ; 850C5C0 gBerryTreePaletteSlotTable_Sitrus: @ 850C5C0
berry_tree_palette_slot_table 4 berry_tree_palette_slot_table 4
.align 2, 0 .align 2, 0
gFieldObjectPicTable_AspearBerryTree: ; 850C5C8 gFieldObjectPicTable_AspearBerryTree: @ 850C5C8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -445,12 +445,12 @@ gFieldObjectPicTable_AspearBerryTree: ; 850C5C8
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Aspear: ; 850C610 gBerryTreePaletteSlotTable_Aspear: @ 850C610
berry_tree_palette_slot_table 3 berry_tree_palette_slot_table 3
.align 2, 0 .align 2, 0
gFieldObjectPicTable_PamtreBerryTree: ; 850C618 gFieldObjectPicTable_PamtreBerryTree: @ 850C618
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -463,12 +463,12 @@ gFieldObjectPicTable_PamtreBerryTree: ; 850C618
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Pamtre: ; 850C660 gBerryTreePaletteSlotTable_Pamtre: @ 850C660
berry_tree_palette_slot_table 2 berry_tree_palette_slot_table 2
.align 2, 0 .align 2, 0
gFieldObjectPicTable_CornnBerryTree: ; 850C668 gFieldObjectPicTable_CornnBerryTree: @ 850C668
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -481,12 +481,12 @@ gFieldObjectPicTable_CornnBerryTree: ; 850C668
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Cornn: ; 850C6B0 gBerryTreePaletteSlotTable_Cornn: @ 850C6B0
berry_tree_palette_slot_table 2 berry_tree_palette_slot_table 2
.align 2, 0 .align 2, 0
gFieldObjectPicTable_LansatBerryTree: ; 850C6B8 gFieldObjectPicTable_LansatBerryTree: @ 850C6B8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -499,12 +499,12 @@ gFieldObjectPicTable_LansatBerryTree: ; 850C6B8
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Lansat: ; 850C700 gBerryTreePaletteSlotTable_Lansat: @ 850C700
berry_tree_palette_slot_table 2 berry_tree_palette_slot_table 2
.align 2, 0 .align 2, 0
gFieldObjectPicTable_DurinBerryTree: ; 850C708 gFieldObjectPicTable_DurinBerryTree: @ 850C708
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -517,12 +517,12 @@ gFieldObjectPicTable_DurinBerryTree: ; 850C708
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Durin: ; 850C750 gBerryTreePaletteSlotTable_Durin: @ 850C750
berry_tree_palette_slot_table 4 berry_tree_palette_slot_table 4
.align 2, 0 .align 2, 0
gFieldObjectPicTable_TamatoBerryTree: ; 850C758 gFieldObjectPicTable_TamatoBerryTree: @ 850C758
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -535,7 +535,7 @@ gFieldObjectPicTable_TamatoBerryTree: ; 850C758
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTable_Tamato: ; 850C7A0 gBerryTreePaletteSlotTable_Tamato: @ 850C7A0
berry_tree_palette_slot_table 2 berry_tree_palette_slot_table 2
.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES .byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES
@@ -544,7 +544,7 @@ gBerryTreePaletteSlotTable_Tamato: ; 850C7A0
.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES .byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES .byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES
gBerryTreeFieldObjectGraphicsIdTable: ; 850C7AA gBerryTreeFieldObjectGraphicsIdTable: @ 850C7AA
.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES .byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES .byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte FIELD_OBJ_GFX_BERRY_TREE_LATE_STAGES .byte FIELD_OBJ_GFX_BERRY_TREE_LATE_STAGES
@@ -553,146 +553,146 @@ gBerryTreeFieldObjectGraphicsIdTable: ; 850C7AA
.align 2, 0 .align 2, 0
gBerryTreePicTablePointers: ; 850C7B0 gBerryTreePicTablePointers: @ 850C7B0
.4byte gFieldObjectPicTable_CheriBerryTree ; Cheri .4byte gFieldObjectPicTable_CheriBerryTree @ Cheri
.4byte gFieldObjectPicTable_ChestoBerryTree ; Chesto .4byte gFieldObjectPicTable_ChestoBerryTree @ Chesto
.4byte gFieldObjectPicTable_PechaBerryTree ; Pecha .4byte gFieldObjectPicTable_PechaBerryTree @ Pecha
.4byte gFieldObjectPicTable_RawstBerryTree ; Rawst .4byte gFieldObjectPicTable_RawstBerryTree @ Rawst
.4byte gFieldObjectPicTable_AspearBerryTree ; Aspear .4byte gFieldObjectPicTable_AspearBerryTree @ Aspear
.4byte gFieldObjectPicTable_LeppaBerryTree ; Leppa .4byte gFieldObjectPicTable_LeppaBerryTree @ Leppa
.4byte gFieldObjectPicTable_OranBerryTree ; Oran .4byte gFieldObjectPicTable_OranBerryTree @ Oran
.4byte gFieldObjectPicTable_PersimBerryTree ; Persim .4byte gFieldObjectPicTable_PersimBerryTree @ Persim
.4byte gFieldObjectPicTable_LumBerryTree ; Lum .4byte gFieldObjectPicTable_LumBerryTree @ Lum
.4byte gFieldObjectPicTable_SitrusBerryTree ; Sitrus .4byte gFieldObjectPicTable_SitrusBerryTree @ Sitrus
.4byte gFieldObjectPicTable_FigyBerryTree ; Figy .4byte gFieldObjectPicTable_FigyBerryTree @ Figy
.4byte gFieldObjectPicTable_WikiBerryTree ; Wiki .4byte gFieldObjectPicTable_WikiBerryTree @ Wiki
.4byte gFieldObjectPicTable_MagoBerryTree ; Mago .4byte gFieldObjectPicTable_MagoBerryTree @ Mago
.4byte gFieldObjectPicTable_AguavBerryTree ; Aguav .4byte gFieldObjectPicTable_AguavBerryTree @ Aguav
.4byte gFieldObjectPicTable_IapapaBerryTree ; Iapapa .4byte gFieldObjectPicTable_IapapaBerryTree @ Iapapa
.4byte gFieldObjectPicTable_RazzBerryTree ; Razz .4byte gFieldObjectPicTable_RazzBerryTree @ Razz
.4byte gFieldObjectPicTable_RazzBerryTree ; Bluk .4byte gFieldObjectPicTable_RazzBerryTree @ Bluk
.4byte gFieldObjectPicTable_MagoBerryTree ; Nanab .4byte gFieldObjectPicTable_MagoBerryTree @ Nanab
.4byte gFieldObjectPicTable_WepearBerryTree ; Wepear .4byte gFieldObjectPicTable_WepearBerryTree @ Wepear
.4byte gFieldObjectPicTable_IapapaBerryTree ; Pinap .4byte gFieldObjectPicTable_IapapaBerryTree @ Pinap
.4byte gFieldObjectPicTable_PomegBerryTree ; Pomeg .4byte gFieldObjectPicTable_PomegBerryTree @ Pomeg
.4byte gFieldObjectPicTable_KelpsyBerryTree ; Kelpsy .4byte gFieldObjectPicTable_KelpsyBerryTree @ Kelpsy
.4byte gFieldObjectPicTable_WepearBerryTree ; Qualot .4byte gFieldObjectPicTable_WepearBerryTree @ Qualot
.4byte gFieldObjectPicTable_HondewBerryTree ; Hondew .4byte gFieldObjectPicTable_HondewBerryTree @ Hondew
.4byte gFieldObjectPicTable_GrepaBerryTree ; Grepa .4byte gFieldObjectPicTable_GrepaBerryTree @ Grepa
.4byte gFieldObjectPicTable_TamatoBerryTree ; Tamato .4byte gFieldObjectPicTable_TamatoBerryTree @ Tamato
.4byte gFieldObjectPicTable_CornnBerryTree ; Cornn .4byte gFieldObjectPicTable_CornnBerryTree @ Cornn
.4byte gFieldObjectPicTable_PomegBerryTree ; Magost .4byte gFieldObjectPicTable_PomegBerryTree @ Magost
.4byte gFieldObjectPicTable_RabutaBerryTree ; Rabuta .4byte gFieldObjectPicTable_RabutaBerryTree @ Rabuta
.4byte gFieldObjectPicTable_NomelBerryTree ; Nomel .4byte gFieldObjectPicTable_NomelBerryTree @ Nomel
.4byte gFieldObjectPicTable_SpelonBerryTree ; Spelon .4byte gFieldObjectPicTable_SpelonBerryTree @ Spelon
.4byte gFieldObjectPicTable_PamtreBerryTree ; Pamtre .4byte gFieldObjectPicTable_PamtreBerryTree @ Pamtre
.4byte gFieldObjectPicTable_RabutaBerryTree ; Watmel .4byte gFieldObjectPicTable_RabutaBerryTree @ Watmel
.4byte gFieldObjectPicTable_DurinBerryTree ; Durin .4byte gFieldObjectPicTable_DurinBerryTree @ Durin
.4byte gFieldObjectPicTable_HondewBerryTree ; Belue .4byte gFieldObjectPicTable_HondewBerryTree @ Belue
.4byte gFieldObjectPicTable_LiechiBerryTree ; Liechi .4byte gFieldObjectPicTable_LiechiBerryTree @ Liechi
.4byte gFieldObjectPicTable_HondewBerryTree ; Ganlon .4byte gFieldObjectPicTable_HondewBerryTree @ Ganlon
.4byte gFieldObjectPicTable_AguavBerryTree ; Salac .4byte gFieldObjectPicTable_AguavBerryTree @ Salac
.4byte gFieldObjectPicTable_PomegBerryTree ; Petaya .4byte gFieldObjectPicTable_PomegBerryTree @ Petaya
.4byte gFieldObjectPicTable_GrepaBerryTree ; Apicot .4byte gFieldObjectPicTable_GrepaBerryTree @ Apicot
.4byte gFieldObjectPicTable_LansatBerryTree ; Lansat .4byte gFieldObjectPicTable_LansatBerryTree @ Lansat
.4byte gFieldObjectPicTable_CornnBerryTree ; Starf .4byte gFieldObjectPicTable_CornnBerryTree @ Starf
.4byte gFieldObjectPicTable_DurinBerryTree ; Enigma .4byte gFieldObjectPicTable_DurinBerryTree @ Enigma
.align 2, 0 .align 2, 0
gBerryTreePaletteSlotTablePointers: ; 850C85C gBerryTreePaletteSlotTablePointers: @ 850C85C
.4byte gBerryTreePaletteSlotTable_Cheri ; Cheri .4byte gBerryTreePaletteSlotTable_Cheri @ Cheri
.4byte gBerryTreePaletteSlotTable_Chesto ; Chesto .4byte gBerryTreePaletteSlotTable_Chesto @ Chesto
.4byte gBerryTreePaletteSlotTable_Pecha ; Pecha .4byte gBerryTreePaletteSlotTable_Pecha @ Pecha
.4byte gBerryTreePaletteSlotTable_Rawst ; Rawst .4byte gBerryTreePaletteSlotTable_Rawst @ Rawst
.4byte gBerryTreePaletteSlotTable_Aspear ; Aspear .4byte gBerryTreePaletteSlotTable_Aspear @ Aspear
.4byte gBerryTreePaletteSlotTable_Leppa ; Leppa .4byte gBerryTreePaletteSlotTable_Leppa @ Leppa
.4byte gBerryTreePaletteSlotTable_Oran ; Oran .4byte gBerryTreePaletteSlotTable_Oran @ Oran
.4byte gBerryTreePaletteSlotTable_Persim ; Persim .4byte gBerryTreePaletteSlotTable_Persim @ Persim
.4byte gBerryTreePaletteSlotTable_Lum ; Lum .4byte gBerryTreePaletteSlotTable_Lum @ Lum
.4byte gBerryTreePaletteSlotTable_Sitrus ; Sitrus .4byte gBerryTreePaletteSlotTable_Sitrus @ Sitrus
.4byte gBerryTreePaletteSlotTable_Figy ; Figy .4byte gBerryTreePaletteSlotTable_Figy @ Figy
.4byte gBerryTreePaletteSlotTable_Wiki ; Wiki .4byte gBerryTreePaletteSlotTable_Wiki @ Wiki
.4byte gBerryTreePaletteSlotTable_Mago ; Mago .4byte gBerryTreePaletteSlotTable_Mago @ Mago
.4byte gBerryTreePaletteSlotTable_Aguav ; Aguav .4byte gBerryTreePaletteSlotTable_Aguav @ Aguav
.4byte gBerryTreePaletteSlotTable_Iapapa ; Iapapa .4byte gBerryTreePaletteSlotTable_Iapapa @ Iapapa
.4byte gBerryTreePaletteSlotTable_Razz ; Razz .4byte gBerryTreePaletteSlotTable_Razz @ Razz
.4byte gBerryTreePaletteSlotTable_Razz ; Bluk .4byte gBerryTreePaletteSlotTable_Razz @ Bluk
.4byte gBerryTreePaletteSlotTable_Mago ; Nanab .4byte gBerryTreePaletteSlotTable_Mago @ Nanab
.4byte gBerryTreePaletteSlotTable_Wepear ; Wepear .4byte gBerryTreePaletteSlotTable_Wepear @ Wepear
.4byte gBerryTreePaletteSlotTable_Iapapa ; Pinap .4byte gBerryTreePaletteSlotTable_Iapapa @ Pinap
.4byte gBerryTreePaletteSlotTable_Pomeg ; Pomeg .4byte gBerryTreePaletteSlotTable_Pomeg @ Pomeg
.4byte gBerryTreePaletteSlotTable_Kelpsy ; Kelpsy .4byte gBerryTreePaletteSlotTable_Kelpsy @ Kelpsy
.4byte gBerryTreePaletteSlotTable_Wepear ; Qualot .4byte gBerryTreePaletteSlotTable_Wepear @ Qualot
.4byte gBerryTreePaletteSlotTable_Hondew ; Hondew .4byte gBerryTreePaletteSlotTable_Hondew @ Hondew
.4byte gBerryTreePaletteSlotTable_Grepa ; Grepa .4byte gBerryTreePaletteSlotTable_Grepa @ Grepa
.4byte gBerryTreePaletteSlotTable_Tamato ; Tamato .4byte gBerryTreePaletteSlotTable_Tamato @ Tamato
.4byte gBerryTreePaletteSlotTable_Cornn ; Cornn .4byte gBerryTreePaletteSlotTable_Cornn @ Cornn
.4byte gBerryTreePaletteSlotTable_Pomeg ; Magost .4byte gBerryTreePaletteSlotTable_Pomeg @ Magost
.4byte gBerryTreePaletteSlotTable_Rabuta ; Rabuta .4byte gBerryTreePaletteSlotTable_Rabuta @ Rabuta
.4byte gBerryTreePaletteSlotTable_Nomel ; Nomel .4byte gBerryTreePaletteSlotTable_Nomel @ Nomel
.4byte gBerryTreePaletteSlotTable_Spelon ; Spelon .4byte gBerryTreePaletteSlotTable_Spelon @ Spelon
.4byte gBerryTreePaletteSlotTable_Pamtre ; Pamtre .4byte gBerryTreePaletteSlotTable_Pamtre @ Pamtre
.4byte gBerryTreePaletteSlotTable_Rabuta ; Watmel .4byte gBerryTreePaletteSlotTable_Rabuta @ Watmel
.4byte gBerryTreePaletteSlotTable_Durin ; Durin .4byte gBerryTreePaletteSlotTable_Durin @ Durin
.4byte gBerryTreePaletteSlotTable_Hondew ; Belue .4byte gBerryTreePaletteSlotTable_Hondew @ Belue
.4byte gBerryTreePaletteSlotTable_Liechi ; Liechi .4byte gBerryTreePaletteSlotTable_Liechi @ Liechi
.4byte gBerryTreePaletteSlotTable_Hondew ; Ganlon .4byte gBerryTreePaletteSlotTable_Hondew @ Ganlon
.4byte gBerryTreePaletteSlotTable_Aguav ; Salac .4byte gBerryTreePaletteSlotTable_Aguav @ Salac
.4byte gBerryTreePaletteSlotTable_Pomeg ; Petaya .4byte gBerryTreePaletteSlotTable_Pomeg @ Petaya
.4byte gBerryTreePaletteSlotTable_Grepa ; Apicot .4byte gBerryTreePaletteSlotTable_Grepa @ Apicot
.4byte gBerryTreePaletteSlotTable_Lansat ; Lansat .4byte gBerryTreePaletteSlotTable_Lansat @ Lansat
.4byte gBerryTreePaletteSlotTable_Cornn ; Starf .4byte gBerryTreePaletteSlotTable_Cornn @ Starf
.4byte gBerryTreePaletteSlotTable_Durin ; Enigma .4byte gBerryTreePaletteSlotTable_Durin @ Enigma
.align 2, 0 .align 2, 0
gBerryTreeFieldObjectGraphicsIdTablePointers: ; 850C908 gBerryTreeFieldObjectGraphicsIdTablePointers: @ 850C908
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Cheri .4byte gBerryTreeFieldObjectGraphicsIdTable @ Cheri
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Chesto .4byte gBerryTreeFieldObjectGraphicsIdTable @ Chesto
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Pecha .4byte gBerryTreeFieldObjectGraphicsIdTable @ Pecha
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Rawst .4byte gBerryTreeFieldObjectGraphicsIdTable @ Rawst
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Aspear .4byte gBerryTreeFieldObjectGraphicsIdTable @ Aspear
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Leppa .4byte gBerryTreeFieldObjectGraphicsIdTable @ Leppa
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Oran .4byte gBerryTreeFieldObjectGraphicsIdTable @ Oran
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Persim .4byte gBerryTreeFieldObjectGraphicsIdTable @ Persim
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Lum .4byte gBerryTreeFieldObjectGraphicsIdTable @ Lum
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Sitrus .4byte gBerryTreeFieldObjectGraphicsIdTable @ Sitrus
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Figy .4byte gBerryTreeFieldObjectGraphicsIdTable @ Figy
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Wiki .4byte gBerryTreeFieldObjectGraphicsIdTable @ Wiki
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Mago .4byte gBerryTreeFieldObjectGraphicsIdTable @ Mago
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Aguav .4byte gBerryTreeFieldObjectGraphicsIdTable @ Aguav
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Iapapa .4byte gBerryTreeFieldObjectGraphicsIdTable @ Iapapa
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Razz .4byte gBerryTreeFieldObjectGraphicsIdTable @ Razz
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Bluk .4byte gBerryTreeFieldObjectGraphicsIdTable @ Bluk
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Nanab .4byte gBerryTreeFieldObjectGraphicsIdTable @ Nanab
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Wepear .4byte gBerryTreeFieldObjectGraphicsIdTable @ Wepear
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Pinap .4byte gBerryTreeFieldObjectGraphicsIdTable @ Pinap
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Pomeg .4byte gBerryTreeFieldObjectGraphicsIdTable @ Pomeg
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Kelpsy .4byte gBerryTreeFieldObjectGraphicsIdTable @ Kelpsy
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Qualot .4byte gBerryTreeFieldObjectGraphicsIdTable @ Qualot
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Hondew .4byte gBerryTreeFieldObjectGraphicsIdTable @ Hondew
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Grepa .4byte gBerryTreeFieldObjectGraphicsIdTable @ Grepa
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Tamato .4byte gBerryTreeFieldObjectGraphicsIdTable @ Tamato
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Cornn .4byte gBerryTreeFieldObjectGraphicsIdTable @ Cornn
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Magost .4byte gBerryTreeFieldObjectGraphicsIdTable @ Magost
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Rabuta .4byte gBerryTreeFieldObjectGraphicsIdTable @ Rabuta
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Nomel .4byte gBerryTreeFieldObjectGraphicsIdTable @ Nomel
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Spelon .4byte gBerryTreeFieldObjectGraphicsIdTable @ Spelon
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Pamtre .4byte gBerryTreeFieldObjectGraphicsIdTable @ Pamtre
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Watmel .4byte gBerryTreeFieldObjectGraphicsIdTable @ Watmel
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Durin .4byte gBerryTreeFieldObjectGraphicsIdTable @ Durin
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Belue .4byte gBerryTreeFieldObjectGraphicsIdTable @ Belue
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Liechi .4byte gBerryTreeFieldObjectGraphicsIdTable @ Liechi
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Ganlon .4byte gBerryTreeFieldObjectGraphicsIdTable @ Ganlon
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Salac .4byte gBerryTreeFieldObjectGraphicsIdTable @ Salac
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Petaya .4byte gBerryTreeFieldObjectGraphicsIdTable @ Petaya
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Apicot .4byte gBerryTreeFieldObjectGraphicsIdTable @ Apicot
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Lansat .4byte gBerryTreeFieldObjectGraphicsIdTable @ Lansat
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Starf .4byte gBerryTreeFieldObjectGraphicsIdTable @ Starf
.4byte gBerryTreeFieldObjectGraphicsIdTable ; Enigma .4byte gBerryTreeFieldObjectGraphicsIdTable @ Enigma
; extras @ extras
.4byte gBerryTreeFieldObjectGraphicsIdTable .4byte gBerryTreeFieldObjectGraphicsIdTable
.4byte gBerryTreeFieldObjectGraphicsIdTable .4byte gBerryTreeFieldObjectGraphicsIdTable
.4byte gBerryTreeFieldObjectGraphicsIdTable .4byte gBerryTreeFieldObjectGraphicsIdTable
data/graphics/field_objects/field_effect_object_template_pointers.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0 .align 2, 0
gFieldEffectObjectTemplatePointers: ; 85059F8 gFieldEffectObjectTemplatePointers: @ 85059F8
.4byte gFieldEffectObjectTemplate_ShadowSmall .4byte gFieldEffectObjectTemplate_ShadowSmall
.4byte gFieldEffectObjectTemplate_ShadowMedium .4byte gFieldEffectObjectTemplate_ShadowMedium
.4byte gFieldEffectObjectTemplate_ShadowLarge .4byte gFieldEffectObjectTemplate_ShadowLarge
data/graphics/field_objects/field_effect_objects.s
+240 -240
View File
File diff suppressed because it is too large Load Diff
data/graphics/field_objects/field_object_anims.s
+123 -123
View File
@@ -1,6 +1,6 @@
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_StayStill: ; 85089FC gFieldObjectImageAnim_StayStill: @ 85089FC
obj_image_anim_frame 0, 8 obj_image_anim_frame 0, 8
obj_image_anim_frame 0, 8 obj_image_anim_frame 0, 8
obj_image_anim_frame 0, 8 obj_image_anim_frame 0, 8
@@ -9,31 +9,31 @@ gFieldObjectImageAnim_StayStill: ; 85089FC
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_QuintyPlumpFaceSouth: ; 8508A10 gFieldObjectImageAnim_QuintyPlumpFaceSouth: @ 8508A10
obj_image_anim_frame 0, 16 obj_image_anim_frame 0, 16
obj_image_anim_jump 0 obj_image_anim_jump 0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_QuintyPlumpFaceNorth: ; 8508A18 gFieldObjectImageAnim_QuintyPlumpFaceNorth: @ 8508A18
obj_image_anim_frame 1, 16 obj_image_anim_frame 1, 16
obj_image_anim_jump 0 obj_image_anim_jump 0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_QuintyPlumpFaceWest: ; 8508A20 gFieldObjectImageAnim_QuintyPlumpFaceWest: @ 8508A20
obj_image_anim_frame 2, 16 obj_image_anim_frame 2, 16
obj_image_anim_jump 0 obj_image_anim_jump 0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_QuintyPlumpFaceEast: ; 8508A28 gFieldObjectImageAnim_QuintyPlumpFaceEast: @ 8508A28
obj_image_anim_frame 2, 16, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 2, 16, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_jump 0 obj_image_anim_jump 0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_QuintyPlumpGoSouth: ; 8508A30 gFieldObjectImageAnim_QuintyPlumpGoSouth: @ 8508A30
obj_image_anim_frame 3, 8 obj_image_anim_frame 3, 8
obj_image_anim_frame 0, 8 obj_image_anim_frame 0, 8
obj_image_anim_frame 3, 8, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 3, 8, OBJ_IMAGE_ANIM_H_FLIP
@@ -42,7 +42,7 @@ gFieldObjectImageAnim_QuintyPlumpGoSouth: ; 8508A30
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_QuintyPlumpGoNorth: ; 8508A44 gFieldObjectImageAnim_QuintyPlumpGoNorth: @ 8508A44
obj_image_anim_frame 4, 8 obj_image_anim_frame 4, 8
obj_image_anim_frame 1, 8 obj_image_anim_frame 1, 8
obj_image_anim_frame 4, 8, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 4, 8, OBJ_IMAGE_ANIM_H_FLIP
@@ -51,7 +51,7 @@ gFieldObjectImageAnim_QuintyPlumpGoNorth: ; 8508A44
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_QuintyPlumpGoWest: ; 8508A58 gFieldObjectImageAnim_QuintyPlumpGoWest: @ 8508A58
obj_image_anim_frame 5, 8 obj_image_anim_frame 5, 8
obj_image_anim_frame 2, 8 obj_image_anim_frame 2, 8
obj_image_anim_frame 6, 8 obj_image_anim_frame 6, 8
@@ -60,7 +60,7 @@ gFieldObjectImageAnim_QuintyPlumpGoWest: ; 8508A58
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_QuintyPlumpGoEast: ; 8508A6C gFieldObjectImageAnim_QuintyPlumpGoEast: @ 8508A6C
obj_image_anim_frame 5, 8, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 5, 8, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 6, 8, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 6, 8, OBJ_IMAGE_ANIM_H_FLIP
@@ -69,7 +69,7 @@ gFieldObjectImageAnim_QuintyPlumpGoEast: ; 8508A6C
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_QuintyPlumpGoFastSouth: ; 8508A80 gFieldObjectImageAnim_QuintyPlumpGoFastSouth: @ 8508A80
obj_image_anim_frame 3, 4 obj_image_anim_frame 3, 4
obj_image_anim_frame 0, 4 obj_image_anim_frame 0, 4
obj_image_anim_frame 3, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 3, 4, OBJ_IMAGE_ANIM_H_FLIP
@@ -78,7 +78,7 @@ gFieldObjectImageAnim_QuintyPlumpGoFastSouth: ; 8508A80
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_QuintyPlumpGoFastNorth: ; 8508A94 gFieldObjectImageAnim_QuintyPlumpGoFastNorth: @ 8508A94
obj_image_anim_frame 4, 4 obj_image_anim_frame 4, 4
obj_image_anim_frame 1, 4 obj_image_anim_frame 1, 4
obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_H_FLIP
@@ -87,7 +87,7 @@ gFieldObjectImageAnim_QuintyPlumpGoFastNorth: ; 8508A94
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_QuintyPlumpGoFastWest: ; 8508AA8 gFieldObjectImageAnim_QuintyPlumpGoFastWest: @ 8508AA8
obj_image_anim_frame 5, 4 obj_image_anim_frame 5, 4
obj_image_anim_frame 2, 4 obj_image_anim_frame 2, 4
obj_image_anim_frame 6, 4 obj_image_anim_frame 6, 4
@@ -96,7 +96,7 @@ gFieldObjectImageAnim_QuintyPlumpGoFastWest: ; 8508AA8
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_QuintyPlumpGoFastEast: ; 8508ABC gFieldObjectImageAnim_QuintyPlumpGoFastEast: @ 8508ABC
obj_image_anim_frame 5, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 5, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 6, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 6, 4, OBJ_IMAGE_ANIM_H_FLIP
@@ -105,7 +105,7 @@ gFieldObjectImageAnim_QuintyPlumpGoFastEast: ; 8508ABC
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_QuintyPlumpGoFasterSouth: ; 8508AD0 gFieldObjectImageAnim_QuintyPlumpGoFasterSouth: @ 8508AD0
obj_image_anim_frame 3, 2 obj_image_anim_frame 3, 2
obj_image_anim_frame 0, 2 obj_image_anim_frame 0, 2
obj_image_anim_frame 3, 2, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 3, 2, OBJ_IMAGE_ANIM_H_FLIP
@@ -114,7 +114,7 @@ gFieldObjectImageAnim_QuintyPlumpGoFasterSouth: ; 8508AD0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_QuintyPlumpGoFasterNorth: ; 8508AE4 gFieldObjectImageAnim_QuintyPlumpGoFasterNorth: @ 8508AE4
obj_image_anim_frame 4, 2 obj_image_anim_frame 4, 2
obj_image_anim_frame 1, 2 obj_image_anim_frame 1, 2
obj_image_anim_frame 4, 2, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 4, 2, OBJ_IMAGE_ANIM_H_FLIP
@@ -123,7 +123,7 @@ gFieldObjectImageAnim_QuintyPlumpGoFasterNorth: ; 8508AE4
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_QuintyPlumpGoFasterWest: ; 8508AF8 gFieldObjectImageAnim_QuintyPlumpGoFasterWest: @ 8508AF8
obj_image_anim_frame 5, 2 obj_image_anim_frame 5, 2
obj_image_anim_frame 2, 2 obj_image_anim_frame 2, 2
obj_image_anim_frame 6, 2 obj_image_anim_frame 6, 2
@@ -132,7 +132,7 @@ gFieldObjectImageAnim_QuintyPlumpGoFasterWest: ; 8508AF8
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_QuintyPlumpGoFasterEast: ; 8508B0C gFieldObjectImageAnim_QuintyPlumpGoFasterEast: @ 8508B0C
obj_image_anim_frame 5, 2, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 5, 2, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 2, 2, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 2, 2, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 6, 2, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 6, 2, OBJ_IMAGE_ANIM_H_FLIP
@@ -141,7 +141,7 @@ gFieldObjectImageAnim_QuintyPlumpGoFasterEast: ; 8508B0C
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_QuintyPlumpGoFastestSouth: ; 8508B20 gFieldObjectImageAnim_QuintyPlumpGoFastestSouth: @ 8508B20
obj_image_anim_frame 3, 1 obj_image_anim_frame 3, 1
obj_image_anim_frame 0, 1 obj_image_anim_frame 0, 1
obj_image_anim_frame 3, 1, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 3, 1, OBJ_IMAGE_ANIM_H_FLIP
@@ -150,7 +150,7 @@ gFieldObjectImageAnim_QuintyPlumpGoFastestSouth: ; 8508B20
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_QuintyPlumpGoFastestNorth: ; 8508B34 gFieldObjectImageAnim_QuintyPlumpGoFastestNorth: @ 8508B34
obj_image_anim_frame 4, 1 obj_image_anim_frame 4, 1
obj_image_anim_frame 1, 1 obj_image_anim_frame 1, 1
obj_image_anim_frame 4, 1, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 4, 1, OBJ_IMAGE_ANIM_H_FLIP
@@ -159,7 +159,7 @@ gFieldObjectImageAnim_QuintyPlumpGoFastestNorth: ; 8508B34
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_QuintyPlumpGoFastestWest: ; 8508B48 gFieldObjectImageAnim_QuintyPlumpGoFastestWest: @ 8508B48
obj_image_anim_frame 5, 1 obj_image_anim_frame 5, 1
obj_image_anim_frame 2, 1 obj_image_anim_frame 2, 1
obj_image_anim_frame 6, 1 obj_image_anim_frame 6, 1
@@ -168,7 +168,7 @@ gFieldObjectImageAnim_QuintyPlumpGoFastestWest: ; 8508B48
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_QuintyPlumpGoFastestEast: ; 8508B5C gFieldObjectImageAnim_QuintyPlumpGoFastestEast: @ 8508B5C
obj_image_anim_frame 5, 1, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 5, 1, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 6, 1, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 6, 1, OBJ_IMAGE_ANIM_H_FLIP
@@ -177,31 +177,31 @@ gFieldObjectImageAnim_QuintyPlumpGoFastestEast: ; 8508B5C
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_FaceSouth: ; 8508B70 gFieldObjectImageAnim_FaceSouth: @ 8508B70
obj_image_anim_frame 0, 16 obj_image_anim_frame 0, 16
obj_image_anim_jump 0 obj_image_anim_jump 0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_FaceNorth: ; 8508B78 gFieldObjectImageAnim_FaceNorth: @ 8508B78
obj_image_anim_frame 1, 16 obj_image_anim_frame 1, 16
obj_image_anim_jump 0 obj_image_anim_jump 0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_FaceWest: ; 8508B80 gFieldObjectImageAnim_FaceWest: @ 8508B80
obj_image_anim_frame 2, 16 obj_image_anim_frame 2, 16
obj_image_anim_jump 0 obj_image_anim_jump 0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_FaceEast: ; 8508B88 gFieldObjectImageAnim_FaceEast: @ 8508B88
obj_image_anim_frame 2, 16, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 2, 16, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_jump 0 obj_image_anim_jump 0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_GoSouth: ; 8508B90 gFieldObjectImageAnim_GoSouth: @ 8508B90
obj_image_anim_frame 3, 8 obj_image_anim_frame 3, 8
obj_image_anim_frame 0, 8 obj_image_anim_frame 0, 8
obj_image_anim_frame 4, 8 obj_image_anim_frame 4, 8
@@ -210,7 +210,7 @@ gFieldObjectImageAnim_GoSouth: ; 8508B90
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_GoNorth: ; 8508BA4 gFieldObjectImageAnim_GoNorth: @ 8508BA4
obj_image_anim_frame 5, 8 obj_image_anim_frame 5, 8
obj_image_anim_frame 1, 8 obj_image_anim_frame 1, 8
obj_image_anim_frame 6, 8 obj_image_anim_frame 6, 8
@@ -219,7 +219,7 @@ gFieldObjectImageAnim_GoNorth: ; 8508BA4
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_GoWest: ; 8508BB8 gFieldObjectImageAnim_GoWest: @ 8508BB8
obj_image_anim_frame 7, 8 obj_image_anim_frame 7, 8
obj_image_anim_frame 2, 8 obj_image_anim_frame 2, 8
obj_image_anim_frame 8, 8 obj_image_anim_frame 8, 8
@@ -228,7 +228,7 @@ gFieldObjectImageAnim_GoWest: ; 8508BB8
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_GoEast: ; 8508BCC gFieldObjectImageAnim_GoEast: @ 8508BCC
obj_image_anim_frame 7, 8, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 7, 8, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 8, 8, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 8, 8, OBJ_IMAGE_ANIM_H_FLIP
@@ -237,7 +237,7 @@ gFieldObjectImageAnim_GoEast: ; 8508BCC
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_GoFastSouth: ; 8508BE0 gFieldObjectImageAnim_GoFastSouth: @ 8508BE0
obj_image_anim_frame 3, 4 obj_image_anim_frame 3, 4
obj_image_anim_frame 0, 4 obj_image_anim_frame 0, 4
obj_image_anim_frame 4, 4 obj_image_anim_frame 4, 4
@@ -246,7 +246,7 @@ gFieldObjectImageAnim_GoFastSouth: ; 8508BE0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_GoFastNorth: ; 8508BF4 gFieldObjectImageAnim_GoFastNorth: @ 8508BF4
obj_image_anim_frame 5, 4 obj_image_anim_frame 5, 4
obj_image_anim_frame 1, 4 obj_image_anim_frame 1, 4
obj_image_anim_frame 6, 4 obj_image_anim_frame 6, 4
@@ -255,7 +255,7 @@ gFieldObjectImageAnim_GoFastNorth: ; 8508BF4
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_GoFastWest: ; 8508C08 gFieldObjectImageAnim_GoFastWest: @ 8508C08
obj_image_anim_frame 7, 4 obj_image_anim_frame 7, 4
obj_image_anim_frame 2, 4 obj_image_anim_frame 2, 4
obj_image_anim_frame 8, 4 obj_image_anim_frame 8, 4
@@ -264,7 +264,7 @@ gFieldObjectImageAnim_GoFastWest: ; 8508C08
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_GoFastEast: ; 8508C1C gFieldObjectImageAnim_GoFastEast: @ 8508C1C
obj_image_anim_frame 7, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 7, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_H_FLIP
@@ -273,7 +273,7 @@ gFieldObjectImageAnim_GoFastEast: ; 8508C1C
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_GoFasterSouth: ; 8508C30 gFieldObjectImageAnim_GoFasterSouth: @ 8508C30
obj_image_anim_frame 3, 2 obj_image_anim_frame 3, 2
obj_image_anim_frame 0, 2 obj_image_anim_frame 0, 2
obj_image_anim_frame 4, 2 obj_image_anim_frame 4, 2
@@ -282,7 +282,7 @@ gFieldObjectImageAnim_GoFasterSouth: ; 8508C30
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_GoFasterNorth: ; 8508C44 gFieldObjectImageAnim_GoFasterNorth: @ 8508C44
obj_image_anim_frame 5, 2 obj_image_anim_frame 5, 2
obj_image_anim_frame 1, 2 obj_image_anim_frame 1, 2
obj_image_anim_frame 6, 2 obj_image_anim_frame 6, 2
@@ -291,7 +291,7 @@ gFieldObjectImageAnim_GoFasterNorth: ; 8508C44
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_GoFasterWest: ; 8508C58 gFieldObjectImageAnim_GoFasterWest: @ 8508C58
obj_image_anim_frame 7, 2 obj_image_anim_frame 7, 2
obj_image_anim_frame 2, 2 obj_image_anim_frame 2, 2
obj_image_anim_frame 8, 2 obj_image_anim_frame 8, 2
@@ -300,7 +300,7 @@ gFieldObjectImageAnim_GoFasterWest: ; 8508C58
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_GoFasterEast: ; 8508C6C gFieldObjectImageAnim_GoFasterEast: @ 8508C6C
obj_image_anim_frame 7, 2, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 7, 2, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 2, 2, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 2, 2, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 8, 2, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 8, 2, OBJ_IMAGE_ANIM_H_FLIP
@@ -309,7 +309,7 @@ gFieldObjectImageAnim_GoFasterEast: ; 8508C6C
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_GoFastestSouth: ; 8508C80 gFieldObjectImageAnim_GoFastestSouth: @ 8508C80
obj_image_anim_frame 3, 1 obj_image_anim_frame 3, 1
obj_image_anim_frame 0, 1 obj_image_anim_frame 0, 1
obj_image_anim_frame 4, 1 obj_image_anim_frame 4, 1
@@ -318,7 +318,7 @@ gFieldObjectImageAnim_GoFastestSouth: ; 8508C80
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_GoFastestNorth: ; 8508C94 gFieldObjectImageAnim_GoFastestNorth: @ 8508C94
obj_image_anim_frame 5, 1 obj_image_anim_frame 5, 1
obj_image_anim_frame 1, 1 obj_image_anim_frame 1, 1
obj_image_anim_frame 6, 1 obj_image_anim_frame 6, 1
@@ -327,7 +327,7 @@ gFieldObjectImageAnim_GoFastestNorth: ; 8508C94
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_GoFastestWest: ; 8508CA8 gFieldObjectImageAnim_GoFastestWest: @ 8508CA8
obj_image_anim_frame 7, 1 obj_image_anim_frame 7, 1
obj_image_anim_frame 2, 1 obj_image_anim_frame 2, 1
obj_image_anim_frame 8, 1 obj_image_anim_frame 8, 1
@@ -336,7 +336,7 @@ gFieldObjectImageAnim_GoFastestWest: ; 8508CA8
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_GoFastestEast: ; 8508CBC gFieldObjectImageAnim_GoFastestEast: @ 8508CBC
obj_image_anim_frame 7, 1, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 7, 1, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 8, 1, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 8, 1, OBJ_IMAGE_ANIM_H_FLIP
@@ -345,7 +345,7 @@ gFieldObjectImageAnim_GoFastestEast: ; 8508CBC
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_RunSouth: ; 8508CD0 gFieldObjectImageAnim_RunSouth: @ 8508CD0
obj_image_anim_frame 12, 5 obj_image_anim_frame 12, 5
obj_image_anim_frame 9, 3 obj_image_anim_frame 9, 3
obj_image_anim_frame 13, 5 obj_image_anim_frame 13, 5
@@ -354,7 +354,7 @@ gFieldObjectImageAnim_RunSouth: ; 8508CD0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_RunNorth: ; 8508CE4 gFieldObjectImageAnim_RunNorth: @ 8508CE4
obj_image_anim_frame 14, 5 obj_image_anim_frame 14, 5
obj_image_anim_frame 10, 3 obj_image_anim_frame 10, 3
obj_image_anim_frame 15, 5 obj_image_anim_frame 15, 5
@@ -363,7 +363,7 @@ gFieldObjectImageAnim_RunNorth: ; 8508CE4
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_RunWest: ; 8508CF8 gFieldObjectImageAnim_RunWest: @ 8508CF8
obj_image_anim_frame 16, 5 obj_image_anim_frame 16, 5
obj_image_anim_frame 11, 3 obj_image_anim_frame 11, 3
obj_image_anim_frame 17, 5 obj_image_anim_frame 17, 5
@@ -372,7 +372,7 @@ gFieldObjectImageAnim_RunWest: ; 8508CF8
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_RunEast: ; 8508D0C gFieldObjectImageAnim_RunEast: @ 8508D0C
obj_image_anim_frame 16, 5, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 16, 5, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 11, 3, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 11, 3, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 17, 5, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 17, 5, OBJ_IMAGE_ANIM_H_FLIP
@@ -381,7 +381,7 @@ gFieldObjectImageAnim_RunEast: ; 8508D0C
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_FieldMove: ; 8508D20 gFieldObjectImageAnim_FieldMove: @ 8508D20
obj_image_anim_frame 0, 4 obj_image_anim_frame 0, 4
obj_image_anim_frame 1, 4 obj_image_anim_frame 1, 4
obj_image_anim_frame 2, 4 obj_image_anim_frame 2, 4
@@ -391,143 +391,143 @@ gFieldObjectImageAnim_FieldMove: ; 8508D20
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_GetOnOffSurfBlobSouth: ; 8508D38 gFieldObjectImageAnim_GetOnOffSurfBlobSouth: @ 8508D38
obj_image_anim_frame 9, 32 obj_image_anim_frame 9, 32
obj_image_anim_jump 0 obj_image_anim_jump 0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_GetOnOffSurfBlobNorth: ; 8508D40 gFieldObjectImageAnim_GetOnOffSurfBlobNorth: @ 8508D40
obj_image_anim_frame 10, 32 obj_image_anim_frame 10, 32
obj_image_anim_jump 0 obj_image_anim_jump 0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_GetOnOffSurfBlobWest: ; 8508D48 gFieldObjectImageAnim_GetOnOffSurfBlobWest: @ 8508D48
obj_image_anim_frame 11, 32 obj_image_anim_frame 11, 32
obj_image_anim_jump 0 obj_image_anim_jump 0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_GetOnOffSurfBlobEast: ; 8508D50 gFieldObjectImageAnim_GetOnOffSurfBlobEast: @ 8508D50
obj_image_anim_frame 11, 32, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 11, 32, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_jump 0 obj_image_anim_jump 0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_BunnyHoppyBackWheelSouth: ; 8508D58 gFieldObjectImageAnim_BunnyHoppyBackWheelSouth: @ 8508D58
obj_image_anim_frame 9, 4 obj_image_anim_frame 9, 4
obj_image_anim_frame 10, 4 obj_image_anim_frame 10, 4
obj_image_anim_end obj_image_anim_end
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_BunnyHoppyBackWheelNorth: ; 8508D64 gFieldObjectImageAnim_BunnyHoppyBackWheelNorth: @ 8508D64
obj_image_anim_frame 13, 4 obj_image_anim_frame 13, 4
obj_image_anim_frame 14, 4 obj_image_anim_frame 14, 4
obj_image_anim_end obj_image_anim_end
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_BunnyHoppyBackWheelWest: ; 8508D70 gFieldObjectImageAnim_BunnyHoppyBackWheelWest: @ 8508D70
obj_image_anim_frame 17, 4 obj_image_anim_frame 17, 4
obj_image_anim_frame 18, 4 obj_image_anim_frame 18, 4
obj_image_anim_end obj_image_anim_end
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_BunnyHoppyBackWheelEast: ; 8508D7C gFieldObjectImageAnim_BunnyHoppyBackWheelEast: @ 8508D7C
obj_image_anim_frame 17, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 17, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 18, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 18, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_end obj_image_anim_end
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_BunnyHoppyFrontWheelSouth: ; 8508D88 gFieldObjectImageAnim_BunnyHoppyFrontWheelSouth: @ 8508D88
obj_image_anim_frame 11, 4 obj_image_anim_frame 11, 4
obj_image_anim_frame 12, 4 obj_image_anim_frame 12, 4
obj_image_anim_end obj_image_anim_end
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_BunnyHoppyFrontWheelNorth: ; 8508D94 gFieldObjectImageAnim_BunnyHoppyFrontWheelNorth: @ 8508D94
obj_image_anim_frame 15, 4 obj_image_anim_frame 15, 4
obj_image_anim_frame 16, 4 obj_image_anim_frame 16, 4
obj_image_anim_end obj_image_anim_end
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_BunnyHoppyFrontWheelWest: ; 8508DA0 gFieldObjectImageAnim_BunnyHoppyFrontWheelWest: @ 8508DA0
obj_image_anim_frame 19, 4 obj_image_anim_frame 19, 4
obj_image_anim_frame 20, 4 obj_image_anim_frame 20, 4
obj_image_anim_end obj_image_anim_end
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_BunnyHoppyFrontWheelEast: ; 8508DAC gFieldObjectImageAnim_BunnyHoppyFrontWheelEast: @ 8508DAC
obj_image_anim_frame 19, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 19, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 20, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 20, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_end obj_image_anim_end
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_StandingWheelieBackWheelSouth: ; 8508DB8 gFieldObjectImageAnim_StandingWheelieBackWheelSouth: @ 8508DB8
obj_image_anim_frame 9, 4 obj_image_anim_frame 9, 4
obj_image_anim_frame 0, 4 obj_image_anim_frame 0, 4
obj_image_anim_end obj_image_anim_end
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_StandingWheelieBackWheelNorth: ; 8508DC4 gFieldObjectImageAnim_StandingWheelieBackWheelNorth: @ 8508DC4
obj_image_anim_frame 13, 4 obj_image_anim_frame 13, 4
obj_image_anim_frame 1, 4 obj_image_anim_frame 1, 4
obj_image_anim_end obj_image_anim_end
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_StandingWheelieBackWheelWest: ; 8508DD0 gFieldObjectImageAnim_StandingWheelieBackWheelWest: @ 8508DD0
obj_image_anim_frame 17, 4 obj_image_anim_frame 17, 4
obj_image_anim_frame 2, 4 obj_image_anim_frame 2, 4
obj_image_anim_end obj_image_anim_end
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_StandingWheelieBackWheelEast: ; 8508DDC gFieldObjectImageAnim_StandingWheelieBackWheelEast: @ 8508DDC
obj_image_anim_frame 17, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 17, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_end obj_image_anim_end
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_StandingWheelieFrontWheelSouth: ; 8508DE8 gFieldObjectImageAnim_StandingWheelieFrontWheelSouth: @ 8508DE8
obj_image_anim_frame 11, 4 obj_image_anim_frame 11, 4
obj_image_anim_frame 0, 4 obj_image_anim_frame 0, 4
obj_image_anim_end obj_image_anim_end
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_StandingWheelieFrontWheelNorth: ; 8508DF4 gFieldObjectImageAnim_StandingWheelieFrontWheelNorth: @ 8508DF4
obj_image_anim_frame 15, 4 obj_image_anim_frame 15, 4
obj_image_anim_frame 1, 4 obj_image_anim_frame 1, 4
obj_image_anim_end obj_image_anim_end
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_StandingWheelieFrontWheelWest: ; 8508E00 gFieldObjectImageAnim_StandingWheelieFrontWheelWest: @ 8508E00
obj_image_anim_frame 19, 4 obj_image_anim_frame 19, 4
obj_image_anim_frame 2, 4 obj_image_anim_frame 2, 4
obj_image_anim_end obj_image_anim_end
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_StandingWheelieFrontWheelEast: ; 8508E0C gFieldObjectImageAnim_StandingWheelieFrontWheelEast: @ 8508E0C
obj_image_anim_frame 19, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 19, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_end obj_image_anim_end
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_MovingWheelieSouth: ; 8508E18 gFieldObjectImageAnim_MovingWheelieSouth: @ 8508E18
obj_image_anim_frame 21, 4 obj_image_anim_frame 21, 4
obj_image_anim_frame 10, 4 obj_image_anim_frame 10, 4
obj_image_anim_frame 22, 4 obj_image_anim_frame 22, 4
@@ -536,7 +536,7 @@ gFieldObjectImageAnim_MovingWheelieSouth: ; 8508E18
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_MovingWheelieNorth: ; 8508E2C gFieldObjectImageAnim_MovingWheelieNorth: @ 8508E2C
obj_image_anim_frame 23, 4 obj_image_anim_frame 23, 4
obj_image_anim_frame 14, 4 obj_image_anim_frame 14, 4
obj_image_anim_frame 24, 4 obj_image_anim_frame 24, 4
@@ -545,7 +545,7 @@ gFieldObjectImageAnim_MovingWheelieNorth: ; 8508E2C
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_MovingWheelieWest: ; 8508E40 gFieldObjectImageAnim_MovingWheelieWest: @ 8508E40
obj_image_anim_frame 25, 4 obj_image_anim_frame 25, 4
obj_image_anim_frame 18, 4 obj_image_anim_frame 18, 4
obj_image_anim_frame 26, 4 obj_image_anim_frame 26, 4
@@ -554,7 +554,7 @@ gFieldObjectImageAnim_MovingWheelieWest: ; 8508E40
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_MovingWheelieEast: ; 8508E54 gFieldObjectImageAnim_MovingWheelieEast: @ 8508E54
obj_image_anim_frame 25, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 25, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 18, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 18, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 26, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 26, 4, OBJ_IMAGE_ANIM_H_FLIP
@@ -563,27 +563,27 @@ gFieldObjectImageAnim_MovingWheelieEast: ; 8508E54
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_BerryTreeStage0: ; 8508E68 gFieldObjectImageAnim_BerryTreeStage0: @ 8508E68
obj_image_anim_frame 0, 32 obj_image_anim_frame 0, 32
obj_image_anim_end obj_image_anim_end
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_BerryTreeStage1: ; 8508E70 gFieldObjectImageAnim_BerryTreeStage1: @ 8508E70
obj_image_anim_frame 1, 32 obj_image_anim_frame 1, 32
obj_image_anim_frame 2, 32 obj_image_anim_frame 2, 32
obj_image_anim_end obj_image_anim_end
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_BerryTreeStage2: ; 8508E7C gFieldObjectImageAnim_BerryTreeStage2: @ 8508E7C
obj_image_anim_frame 3, 48 obj_image_anim_frame 3, 48
obj_image_anim_frame 4, 48 obj_image_anim_frame 4, 48
obj_image_anim_end obj_image_anim_end
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_BerryTreeStage3: ; 8508E88 gFieldObjectImageAnim_BerryTreeStage3: @ 8508E88
obj_image_anim_frame 5, 32 obj_image_anim_frame 5, 32
obj_image_anim_frame 5, 32 obj_image_anim_frame 5, 32
obj_image_anim_frame 6, 32 obj_image_anim_frame 6, 32
@@ -592,7 +592,7 @@ gFieldObjectImageAnim_BerryTreeStage3: ; 8508E88
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_BerryTreeStage4: ; 8508E9C gFieldObjectImageAnim_BerryTreeStage4: @ 8508E9C
obj_image_anim_frame 7, 48 obj_image_anim_frame 7, 48
obj_image_anim_frame 7, 48 obj_image_anim_frame 7, 48
obj_image_anim_frame 8, 48 obj_image_anim_frame 8, 48
@@ -601,7 +601,7 @@ gFieldObjectImageAnim_BerryTreeStage4: ; 8508E9C
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_NurseBow: ; 8508EB0 gFieldObjectImageAnim_NurseBow: @ 8508EB0
obj_image_anim_frame 0, 8 obj_image_anim_frame 0, 8
obj_image_anim_frame 9, 32 obj_image_anim_frame 9, 32
obj_image_anim_frame 0, 8 obj_image_anim_frame 0, 8
@@ -609,7 +609,7 @@ gFieldObjectImageAnim_NurseBow: ; 8508EB0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_RockBreak: ; 8508EC0 gFieldObjectImageAnim_RockBreak: @ 8508EC0
obj_image_anim_frame 0, 8 obj_image_anim_frame 0, 8
obj_image_anim_frame 1, 8 obj_image_anim_frame 1, 8
obj_image_anim_frame 2, 8 obj_image_anim_frame 2, 8
@@ -618,7 +618,7 @@ gFieldObjectImageAnim_RockBreak: ; 8508EC0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_TreeCut: ; 8508ED4 gFieldObjectImageAnim_TreeCut: @ 8508ED4
obj_image_anim_frame 0, 6 obj_image_anim_frame 0, 6
obj_image_anim_frame 1, 6 obj_image_anim_frame 1, 6
obj_image_anim_frame 2, 6 obj_image_anim_frame 2, 6
@@ -627,7 +627,7 @@ gFieldObjectImageAnim_TreeCut: ; 8508ED4
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_TakeOutRodSouth: ; 8508EE8 gFieldObjectImageAnim_TakeOutRodSouth: @ 8508EE8
obj_image_anim_frame 8, 4 obj_image_anim_frame 8, 4
obj_image_anim_frame 9, 4 obj_image_anim_frame 9, 4
obj_image_anim_frame 10, 4 obj_image_anim_frame 10, 4
@@ -636,7 +636,7 @@ gFieldObjectImageAnim_TakeOutRodSouth: ; 8508EE8
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_TakeOutRodNorth: ; 8508EFC gFieldObjectImageAnim_TakeOutRodNorth: @ 8508EFC
obj_image_anim_frame 4, 4 obj_image_anim_frame 4, 4
obj_image_anim_frame 5, 4 obj_image_anim_frame 5, 4
obj_image_anim_frame 6, 4 obj_image_anim_frame 6, 4
@@ -645,7 +645,7 @@ gFieldObjectImageAnim_TakeOutRodNorth: ; 8508EFC
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_TakeOutRodWest: ; 8508F10 gFieldObjectImageAnim_TakeOutRodWest: @ 8508F10
obj_image_anim_frame 0, 4 obj_image_anim_frame 0, 4
obj_image_anim_frame 1, 4 obj_image_anim_frame 1, 4
obj_image_anim_frame 2, 4 obj_image_anim_frame 2, 4
@@ -654,7 +654,7 @@ gFieldObjectImageAnim_TakeOutRodWest: ; 8508F10
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_TakeOutRodEast: ; 8508F24 gFieldObjectImageAnim_TakeOutRodEast: @ 8508F24
obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 1, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 1, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
@@ -663,7 +663,7 @@ gFieldObjectImageAnim_TakeOutRodEast: ; 8508F24
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_PutAwayRodSouth: ; 8508F38 gFieldObjectImageAnim_PutAwayRodSouth: @ 8508F38
obj_image_anim_frame 11, 4 obj_image_anim_frame 11, 4
obj_image_anim_frame 10, 6 obj_image_anim_frame 10, 6
obj_image_anim_frame 9, 6 obj_image_anim_frame 9, 6
@@ -672,7 +672,7 @@ gFieldObjectImageAnim_PutAwayRodSouth: ; 8508F38
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_PutAwayRodNorth: ; 8508F4C gFieldObjectImageAnim_PutAwayRodNorth: @ 8508F4C
obj_image_anim_frame 7, 4 obj_image_anim_frame 7, 4
obj_image_anim_frame 6, 6 obj_image_anim_frame 6, 6
obj_image_anim_frame 5, 6 obj_image_anim_frame 5, 6
@@ -681,7 +681,7 @@ gFieldObjectImageAnim_PutAwayRodNorth: ; 8508F4C
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_PutAwayRodWest: ; 8508F60 gFieldObjectImageAnim_PutAwayRodWest: @ 8508F60
obj_image_anim_frame 3, 4 obj_image_anim_frame 3, 4
obj_image_anim_frame 2, 4 obj_image_anim_frame 2, 4
obj_image_anim_frame 1, 4 obj_image_anim_frame 1, 4
@@ -690,7 +690,7 @@ gFieldObjectImageAnim_PutAwayRodWest: ; 8508F60
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_PutAwayRodEast: ; 8508F74 gFieldObjectImageAnim_PutAwayRodEast: @ 8508F74
obj_image_anim_frame 3, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 3, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 1, 4, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 1, 4, OBJ_IMAGE_ANIM_H_FLIP
@@ -699,7 +699,7 @@ gFieldObjectImageAnim_PutAwayRodEast: ; 8508F74
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_HookedPokemonSouth: ; 8508F88 gFieldObjectImageAnim_HookedPokemonSouth: @ 8508F88
obj_image_anim_frame 10, 6 obj_image_anim_frame 10, 6
obj_image_anim_frame 11, 6 obj_image_anim_frame 11, 6
obj_image_anim_loop 1 obj_image_anim_loop 1
@@ -708,7 +708,7 @@ gFieldObjectImageAnim_HookedPokemonSouth: ; 8508F88
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_HookedPokemonNorth: ; 8508F9C gFieldObjectImageAnim_HookedPokemonNorth: @ 8508F9C
obj_image_anim_frame 6, 6 obj_image_anim_frame 6, 6
obj_image_anim_frame 7, 6 obj_image_anim_frame 7, 6
obj_image_anim_loop 1 obj_image_anim_loop 1
@@ -717,7 +717,7 @@ gFieldObjectImageAnim_HookedPokemonNorth: ; 8508F9C
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_HookedPokemonWest: ; 8508FB0 gFieldObjectImageAnim_HookedPokemonWest: @ 8508FB0
obj_image_anim_frame 2, 6 obj_image_anim_frame 2, 6
obj_image_anim_frame 3, 6 obj_image_anim_frame 3, 6
obj_image_anim_loop 1 obj_image_anim_loop 1
@@ -726,7 +726,7 @@ gFieldObjectImageAnim_HookedPokemonWest: ; 8508FB0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_HookedPokemonEast: ; 8508FC4 gFieldObjectImageAnim_HookedPokemonEast: @ 8508FC4
obj_image_anim_frame 2, 6, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 2, 6, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 3, 6, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_frame 3, 6, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_loop 1 obj_image_anim_loop 1
@@ -735,7 +735,7 @@ gFieldObjectImageAnim_HookedPokemonEast: ; 8508FC4
.align 2, 0 .align 2, 0
gFieldObjectRotScalAnim_8508FD8: ; 8508FD8 gFieldObjectRotScalAnim_8508FD8: @ 8508FD8
obj_rot_scal_anim_frame 0x0, 0x0, 1, 1 obj_rot_scal_anim_frame 0x0, 0x0, 1, 1
obj_rot_scal_anim_frame 0x0, 0x0, 0, 1 obj_rot_scal_anim_frame 0x0, 0x0, 0, 1
obj_rot_scal_anim_frame 0x0, 0x0, 0, 1 obj_rot_scal_anim_frame 0x0, 0x0, 0, 1
@@ -745,7 +745,7 @@ gFieldObjectRotScalAnim_8508FD8: ; 8508FD8
.align 2, 0 .align 2, 0
gFieldObjectRotScalAnim_8509008: ; 8509008 gFieldObjectRotScalAnim_8509008: @ 8509008
obj_rot_scal_anim_frame 0x0, 0x0, -1, 1 obj_rot_scal_anim_frame 0x0, 0x0, -1, 1
obj_rot_scal_anim_frame 0x0, 0x0, 0, 1 obj_rot_scal_anim_frame 0x0, 0x0, 0, 1
obj_rot_scal_anim_loop 15 obj_rot_scal_anim_loop 15
@@ -756,33 +756,33 @@ gFieldObjectRotScalAnim_8509008: ; 8509008
.align 2, 0 .align 2, 0
gFieldObjectRotScalAnim_8509040: ; 8509040 gFieldObjectRotScalAnim_8509040: @ 8509040
obj_rot_scal_anim_frame 0x100, 0x100, 10, 0 obj_rot_scal_anim_frame 0x100, 0x100, 10, 0
obj_rot_scal_anim_end obj_rot_scal_anim_end
.align 2, 0 .align 2, 0
gFieldObjectRotScalAnim_8509050: ; 8509050 gFieldObjectRotScalAnim_8509050: @ 8509050
obj_rot_scal_anim_frame 0x100, 0x100, 10, 0 obj_rot_scal_anim_frame 0x100, 0x100, 10, 0
obj_rot_scal_anim_end obj_rot_scal_anim_end
.align 2, 0 .align 2, 0
gFieldObjectRotScalAnim_8509060: ; 8509060 gFieldObjectRotScalAnim_8509060: @ 8509060
obj_rot_scal_anim_frame 0x0, 0x0, -1, 1 obj_rot_scal_anim_frame 0x0, 0x0, -1, 1
obj_rot_scal_anim_loop 8 obj_rot_scal_anim_loop 8
obj_rot_scal_anim_end obj_rot_scal_anim_end
.align 2, 0 .align 2, 0
gFieldObjectRotScalAnim_8509078: ; 8509078 gFieldObjectRotScalAnim_8509078: @ 8509078
obj_rot_scal_anim_frame 0x0, 0x0, 1, 1 obj_rot_scal_anim_frame 0x0, 0x0, 1, 1
obj_rot_scal_anim_loop 8 obj_rot_scal_anim_loop 8
obj_rot_scal_anim_end obj_rot_scal_anim_end
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_HoOhFlapWings: ; 8509090 gFieldObjectImageAnim_HoOhFlapWings: @ 8509090
obj_image_anim_frame 3, 8 obj_image_anim_frame 3, 8
obj_image_anim_frame 4, 8 obj_image_anim_frame 4, 8
obj_image_anim_frame 3, 8 obj_image_anim_frame 3, 8
@@ -791,18 +791,18 @@ gFieldObjectImageAnim_HoOhFlapWings: ; 8509090
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_HoOhStayStill: ; 85090A4 gFieldObjectImageAnim_HoOhStayStill: @ 85090A4
obj_image_anim_frame 3, 16 obj_image_anim_frame 3, 16
obj_image_anim_jump 0 obj_image_anim_jump 0
.align 2, 0 .align 2, 0
gFieldObjectImageAnimTable_Inanimate: ; 85090AC gFieldObjectImageAnimTable_Inanimate: @ 85090AC
.4byte gFieldObjectImageAnim_StayStill .4byte gFieldObjectImageAnim_StayStill
.align 2, 0 .align 2, 0
gFieldObjectImageAnimTable_QuintyPlump: ; 85090B0 gFieldObjectImageAnimTable_QuintyPlump: @ 85090B0
.4byte gFieldObjectImageAnim_QuintyPlumpFaceSouth .4byte gFieldObjectImageAnim_QuintyPlumpFaceSouth
.4byte gFieldObjectImageAnim_QuintyPlumpFaceNorth .4byte gFieldObjectImageAnim_QuintyPlumpFaceNorth
.4byte gFieldObjectImageAnim_QuintyPlumpFaceWest .4byte gFieldObjectImageAnim_QuintyPlumpFaceWest
@@ -826,7 +826,7 @@ gFieldObjectImageAnimTable_QuintyPlump: ; 85090B0
.align 2, 0 .align 2, 0
gFieldObjectImageAnimTable_Standard: ; 8509100 gFieldObjectImageAnimTable_Standard: @ 8509100
.4byte gFieldObjectImageAnim_FaceSouth .4byte gFieldObjectImageAnim_FaceSouth
.4byte gFieldObjectImageAnim_FaceNorth .4byte gFieldObjectImageAnim_FaceNorth
.4byte gFieldObjectImageAnim_FaceWest .4byte gFieldObjectImageAnim_FaceWest
@@ -850,7 +850,7 @@ gFieldObjectImageAnimTable_Standard: ; 8509100
.align 2, 0 .align 2, 0
gFieldObjectImageAnimTable_HoOh: ; 8509150 gFieldObjectImageAnimTable_HoOh: @ 8509150
.4byte gFieldObjectImageAnim_FaceSouth .4byte gFieldObjectImageAnim_FaceSouth
.4byte gFieldObjectImageAnim_FaceNorth .4byte gFieldObjectImageAnim_FaceNorth
.4byte gFieldObjectImageAnim_FaceWest .4byte gFieldObjectImageAnim_FaceWest
@@ -874,7 +874,7 @@ gFieldObjectImageAnimTable_HoOh: ; 8509150
.align 2, 0 .align 2, 0
gFieldObjectImageAnimTable_Groudon3: ; 85091A0 gFieldObjectImageAnimTable_Groudon3: @ 85091A0
.4byte gFieldObjectImageAnim_FaceSouth .4byte gFieldObjectImageAnim_FaceSouth
.4byte gFieldObjectImageAnim_FaceNorth .4byte gFieldObjectImageAnim_FaceNorth
.4byte gFieldObjectImageAnim_FaceWest .4byte gFieldObjectImageAnim_FaceWest
@@ -898,61 +898,61 @@ gFieldObjectImageAnimTable_Groudon3: ; 85091A0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_85091F0: ; 85091F0 gFieldObjectImageAnim_85091F0: @ 85091F0
obj_image_anim_frame 1, 1 obj_image_anim_frame 1, 1
obj_image_anim_jump 0 obj_image_anim_jump 0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_85091F8: ; 85091F8 gFieldObjectImageAnim_85091F8: @ 85091F8
obj_image_anim_frame 4, 1 obj_image_anim_frame 4, 1
obj_image_anim_jump 0 obj_image_anim_jump 0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_8509200: ; 8509200 gFieldObjectImageAnim_8509200: @ 8509200
obj_image_anim_frame 0, 1 obj_image_anim_frame 0, 1
obj_image_anim_jump 0 obj_image_anim_jump 0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_8509208: ; 8509208 gFieldObjectImageAnim_8509208: @ 8509208
obj_image_anim_frame 2, 1 obj_image_anim_frame 2, 1
obj_image_anim_jump 0 obj_image_anim_jump 0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_8509210: ; 8509210 gFieldObjectImageAnim_8509210: @ 8509210
obj_image_anim_frame 3, 1 obj_image_anim_frame 3, 1
obj_image_anim_jump 0 obj_image_anim_jump 0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_8509218: ; 8509218 gFieldObjectImageAnim_8509218: @ 8509218
obj_image_anim_frame 0, 1 obj_image_anim_frame 0, 1
obj_image_anim_jump 0 obj_image_anim_jump 0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_8509220: ; 8509220 gFieldObjectImageAnim_8509220: @ 8509220
obj_image_anim_frame 0, 1 obj_image_anim_frame 0, 1
obj_image_anim_jump 0 obj_image_anim_jump 0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_8509228: ; 8509228 gFieldObjectImageAnim_8509228: @ 8509228
obj_image_anim_frame 0, 1 obj_image_anim_frame 0, 1
obj_image_anim_jump 0 obj_image_anim_jump 0
.align 2, 0 .align 2, 0
gFieldObjectImageAnim_8509230: ; 8509230 gFieldObjectImageAnim_8509230: @ 8509230
obj_image_anim_frame 3, 1 obj_image_anim_frame 3, 1
obj_image_anim_jump 0 obj_image_anim_jump 0
.align 2, 0 .align 2, 0
gFieldObjectImageAnimTable_Rayquaza2: ; 8509238 gFieldObjectImageAnimTable_Rayquaza2: @ 8509238
.4byte gFieldObjectImageAnim_8509218 .4byte gFieldObjectImageAnim_8509218
.4byte gFieldObjectImageAnim_8509220 .4byte gFieldObjectImageAnim_8509220
.4byte gFieldObjectImageAnim_8509228 .4byte gFieldObjectImageAnim_8509228
@@ -976,7 +976,7 @@ gFieldObjectImageAnimTable_Rayquaza2: ; 8509238
.align 2, 0 .align 2, 0
gFieldObjectImageAnimTable_BrendanMayNormal: ; 8509288 gFieldObjectImageAnimTable_BrendanMayNormal: @ 8509288
.4byte gFieldObjectImageAnim_FaceSouth .4byte gFieldObjectImageAnim_FaceSouth
.4byte gFieldObjectImageAnim_FaceNorth .4byte gFieldObjectImageAnim_FaceNorth
.4byte gFieldObjectImageAnim_FaceWest .4byte gFieldObjectImageAnim_FaceWest
@@ -1004,7 +1004,7 @@ gFieldObjectImageAnimTable_BrendanMayNormal: ; 8509288
.align 2, 0 .align 2, 0
gFieldObjectImageAnimTable_AcroBike: ; 85092E8 gFieldObjectImageAnimTable_AcroBike: @ 85092E8
.4byte gFieldObjectImageAnim_FaceSouth .4byte gFieldObjectImageAnim_FaceSouth
.4byte gFieldObjectImageAnim_FaceNorth .4byte gFieldObjectImageAnim_FaceNorth
.4byte gFieldObjectImageAnim_FaceWest .4byte gFieldObjectImageAnim_FaceWest
@@ -1048,7 +1048,7 @@ gFieldObjectImageAnimTable_AcroBike: ; 85092E8
.align 2, 0 .align 2, 0
gFieldObjectImageAnimTable_Surfing: ; 8509388 gFieldObjectImageAnimTable_Surfing: @ 8509388
.4byte gFieldObjectImageAnim_FaceSouth .4byte gFieldObjectImageAnim_FaceSouth
.4byte gFieldObjectImageAnim_FaceNorth .4byte gFieldObjectImageAnim_FaceNorth
.4byte gFieldObjectImageAnim_FaceWest .4byte gFieldObjectImageAnim_FaceWest
@@ -1076,7 +1076,7 @@ gFieldObjectImageAnimTable_Surfing: ; 8509388
.align 2, 0 .align 2, 0
gFieldObjectImageAnimTable_Nurse: ; 85093E8 gFieldObjectImageAnimTable_Nurse: @ 85093E8
.4byte gFieldObjectImageAnim_FaceSouth .4byte gFieldObjectImageAnim_FaceSouth
.4byte gFieldObjectImageAnim_FaceNorth .4byte gFieldObjectImageAnim_FaceNorth
.4byte gFieldObjectImageAnim_FaceWest .4byte gFieldObjectImageAnim_FaceWest
@@ -1101,12 +1101,12 @@ gFieldObjectImageAnimTable_Nurse: ; 85093E8
.align 2, 0 .align 2, 0
gFieldObjectImageAnimTable_FieldMove: ; 850943C gFieldObjectImageAnimTable_FieldMove: @ 850943C
.4byte gFieldObjectImageAnim_FieldMove .4byte gFieldObjectImageAnim_FieldMove
.align 2, 0 .align 2, 0
gFieldObjectImageAnimTable_BerryTree: ; 8509440 gFieldObjectImageAnimTable_BerryTree: @ 8509440
.4byte gFieldObjectImageAnim_BerryTreeStage0 .4byte gFieldObjectImageAnim_BerryTreeStage0
.4byte gFieldObjectImageAnim_BerryTreeStage1 .4byte gFieldObjectImageAnim_BerryTreeStage1
.4byte gFieldObjectImageAnim_BerryTreeStage2 .4byte gFieldObjectImageAnim_BerryTreeStage2
@@ -1115,19 +1115,19 @@ gFieldObjectImageAnimTable_BerryTree: ; 8509440
.align 2, 0 .align 2, 0
gFieldObjectImageAnimTable_BreakableRock: ; 8509454 gFieldObjectImageAnimTable_BreakableRock: @ 8509454
.4byte gFieldObjectImageAnim_StayStill .4byte gFieldObjectImageAnim_StayStill
.4byte gFieldObjectImageAnim_RockBreak .4byte gFieldObjectImageAnim_RockBreak
.align 2, 0 .align 2, 0
gFieldObjectImageAnimTable_CuttableTree: ; 850945C gFieldObjectImageAnimTable_CuttableTree: @ 850945C
.4byte gFieldObjectImageAnim_StayStill .4byte gFieldObjectImageAnim_StayStill
.4byte gFieldObjectImageAnim_TreeCut .4byte gFieldObjectImageAnim_TreeCut
.align 2, 0 .align 2, 0
gFieldObjectImageAnimTable_Fishing: ; 8509464 gFieldObjectImageAnimTable_Fishing: @ 8509464
.4byte gFieldObjectImageAnim_TakeOutRodSouth .4byte gFieldObjectImageAnim_TakeOutRodSouth
.4byte gFieldObjectImageAnim_TakeOutRodNorth .4byte gFieldObjectImageAnim_TakeOutRodNorth
.4byte gFieldObjectImageAnim_TakeOutRodWest .4byte gFieldObjectImageAnim_TakeOutRodWest
@@ -1143,7 +1143,7 @@ gFieldObjectImageAnimTable_Fishing: ; 8509464
.align 2, 0 .align 2, 0
gFieldObjectRotScalAnimTable_KyogreGroudon: ; 8509494 gFieldObjectRotScalAnimTable_KyogreGroudon: @ 8509494
.4byte gFieldObjectRotScalAnim_8508FD8 .4byte gFieldObjectRotScalAnim_8508FD8
.4byte gFieldObjectRotScalAnim_8509008 .4byte gFieldObjectRotScalAnim_8509008
.4byte gFieldObjectRotScalAnim_8509050 .4byte gFieldObjectRotScalAnim_8509050
data/graphics/field_objects/field_object_graphics.s
+1628 -1628
View File
File diff suppressed because it is too large Load Diff
data/graphics/field_objects/field_object_graphics_info.s
+2206 -2206
View File
File diff suppressed because it is too large Load Diff
data/graphics/field_objects/field_object_graphics_info_pointers.s
+2 -2
View File
@@ -1,6 +1,6 @@
.align 2, 0 .align 2, 0
gFieldObjectGraphicsInfoPointers: ; 8505620 gFieldObjectGraphicsInfoPointers: @ 8505620
.4byte gFieldObjectGraphicsInfo_BrendanNormal .4byte gFieldObjectGraphicsInfo_BrendanNormal
.4byte gFieldObjectGraphicsInfo_BrendanMachBike .4byte gFieldObjectGraphicsInfo_BrendanMachBike
.4byte gFieldObjectGraphicsInfo_BrendanSurfing .4byte gFieldObjectGraphicsInfo_BrendanSurfing
@@ -243,7 +243,7 @@ gFieldObjectGraphicsInfoPointers: ; 8505620
.align 2, 0 .align 2, 0
gMauvilleOldManGraphicsInfoPointers: ; 85059DC gMauvilleOldManGraphicsInfoPointers: @ 85059DC
.4byte gFieldObjectGraphicsInfo_Bard .4byte gFieldObjectGraphicsInfo_Bard
.4byte gFieldObjectGraphicsInfo_Hipster .4byte gFieldObjectGraphicsInfo_Hipster
.4byte gFieldObjectGraphicsInfo_Trader .4byte gFieldObjectGraphicsInfo_Trader
data/graphics/field_objects/field_object_oam.s
+152 -152
View File
@@ -1,203 +1,203 @@
.align 2, 0 .align 2, 0
gFieldObjectBaseOam_8x8: ; 85094EC gFieldObjectBaseOam_8x8: @ 85094EC
.4byte OAM_SIZE_8x8 .4byte OAM_SIZE_8x8
.2byte 2 << 10 ; priority .2byte 2 << 10 @ priority
.align 2, 0 .align 2, 0
gFieldObjectBaseOam_16x8: ; 85094F4 gFieldObjectBaseOam_16x8: @ 85094F4
.4byte OAM_SIZE_16x8 .4byte OAM_SIZE_16x8
.2byte 2 << 10 ; priority .2byte 2 << 10 @ priority
.align 2, 0 .align 2, 0
gFieldObjectBaseOam_16x16: ; 85094FC gFieldObjectBaseOam_16x16: @ 85094FC
.4byte OAM_SIZE_16x16 .4byte OAM_SIZE_16x16
.2byte 2 << 10 ; priority .2byte 2 << 10 @ priority
.align 2, 0 .align 2, 0
gFieldObjectBaseOam_32x8: ; 8509504 gFieldObjectBaseOam_32x8: @ 8509504
.4byte OAM_SIZE_32x8 .4byte OAM_SIZE_32x8
.2byte 2 << 10 ; priority .2byte 2 << 10 @ priority
.align 2, 0 .align 2, 0
gFieldObjectBaseOam_64x32: ; 850950C gFieldObjectBaseOam_64x32: @ 850950C
.4byte OAM_SIZE_64x32 .4byte OAM_SIZE_64x32
.2byte 2 << 10 ; priority .2byte 2 << 10 @ priority
.align 2, 0 .align 2, 0
gFieldObjectBaseOam_16x32: ; 8509514 gFieldObjectBaseOam_16x32: @ 8509514
.4byte OAM_SIZE_16x32 .4byte OAM_SIZE_16x32
.2byte 2 << 10 ; priority .2byte 2 << 10 @ priority
.align 2, 0 .align 2, 0
gFieldObjectBaseOam_32x32: ; 850951C gFieldObjectBaseOam_32x32: @ 850951C
.4byte OAM_SIZE_32x32 .4byte OAM_SIZE_32x32
.2byte 2 << 10 ; priority .2byte 2 << 10 @ priority
.align 2, 0 .align 2, 0
gFieldObjectBaseOam_64x64: ; 8509524 gFieldObjectBaseOam_64x64: @ 8509524
.4byte OAM_SIZE_64x64 .4byte OAM_SIZE_64x64
.2byte 2 << 10 ; priority .2byte 2 << 10 @ priority
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_16x16_0: ; 850952C gFieldObjectSpriteOamTable_16x16_0: @ 850952C
sprite_oam -8, -8, 2, 0, 16x16 sprite_oam -8, -8, 2, 0, 16x16
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_16x16_1: ; 8509530 gFieldObjectSpriteOamTable_16x16_1: @ 8509530
sprite_oam -8, -8, 1, 0, 16x16 sprite_oam -8, -8, 1, 0, 16x16
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_16x16_2: ; 8509534 gFieldObjectSpriteOamTable_16x16_2: @ 8509534
sprite_oam -8, -8, 2, 0, 16x8 sprite_oam -8, -8, 2, 0, 16x8
sprite_oam -8, 0, 3, 2, 16x8 sprite_oam -8, 0, 3, 2, 16x8
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_16x16_3: ; 850953C gFieldObjectSpriteOamTable_16x16_3: @ 850953C
sprite_oam -8, -8, 2, 0, 16x16 sprite_oam -8, -8, 2, 0, 16x16
sprite_oam -8, -8, 3, 0, 16x16 sprite_oam -8, -8, 3, 0, 16x16
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_16x16_4: ; 8509544 gFieldObjectSpriteOamTable_16x16_4: @ 8509544
sprite_oam -8, -8, 1, 0, 16x16 sprite_oam -8, -8, 1, 0, 16x16
sprite_oam -8, -8, 3, 0, 16x16 sprite_oam -8, -8, 3, 0, 16x16
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTables_16x16: ; 850954C gFieldObjectSpriteOamTables_16x16: @ 850954C
.4byte 0 ; number of sprites .4byte 0 @ number of sprites
.4byte NULL ; unknown .4byte NULL @ unknown
.4byte 1 ; number of sprites .4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x16_0 ; below high bridge .4byte gFieldObjectSpriteOamTable_16x16_0 @ below high bridge
.4byte 1 ; number of sprites .4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x16_1 ; above high bridge .4byte gFieldObjectSpriteOamTable_16x16_1 @ above high bridge
.4byte 2 ; number of sprites .4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x16_2 ; unknown .4byte gFieldObjectSpriteOamTable_16x16_2 @ unknown
.4byte 2 ; number of sprites .4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x16_3 ; long grass below high bridge .4byte gFieldObjectSpriteOamTable_16x16_3 @ long grass below high bridge
.4byte 2 ; number of sprites .4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x16_4 ; long grass above high bridge .4byte gFieldObjectSpriteOamTable_16x16_4 @ long grass above high bridge
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_16x32_0: ; 850957C gFieldObjectSpriteOamTable_16x32_0: @ 850957C
sprite_oam -8, -16, 2, 0, 16x32 sprite_oam -8, -16, 2, 0, 16x32
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_16x32_1: ; 8509580 gFieldObjectSpriteOamTable_16x32_1: @ 8509580
sprite_oam -8, -16, 1, 0, 16x32 sprite_oam -8, -16, 1, 0, 16x32
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_16x32_2: ; 8509584 gFieldObjectSpriteOamTable_16x32_2: @ 8509584
sprite_oam -8, -16, 2, 0, 16x16 sprite_oam -8, -16, 2, 0, 16x16
sprite_oam -8, 0, 2, 4, 16x8 sprite_oam -8, 0, 2, 4, 16x8
sprite_oam -8, 8, 3, 6, 16x8 sprite_oam -8, 8, 3, 6, 16x8
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_16x32_3: ; 8509590 gFieldObjectSpriteOamTable_16x32_3: @ 8509590
sprite_oam -8, -16, 2, 0, 16x16 sprite_oam -8, -16, 2, 0, 16x16
sprite_oam -8, 0, 3, 4, 16x16 sprite_oam -8, 0, 3, 4, 16x16
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_16x32_4: ; 8509598 gFieldObjectSpriteOamTable_16x32_4: @ 8509598
sprite_oam -8, -16, 1, 0, 16x16 sprite_oam -8, -16, 1, 0, 16x16
sprite_oam -8, 0, 3, 4, 16x16 sprite_oam -8, 0, 3, 4, 16x16
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTables_16x32: ; 85095A0 gFieldObjectSpriteOamTables_16x32: @ 85095A0
.4byte 0 ; number of sprites .4byte 0 @ number of sprites
.4byte NULL ; unknown .4byte NULL @ unknown
.4byte 1 ; number of sprites .4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x32_0 ; below high bridge .4byte gFieldObjectSpriteOamTable_16x32_0 @ below high bridge
.4byte 1 ; number of sprites .4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x32_1 ; above high bridge .4byte gFieldObjectSpriteOamTable_16x32_1 @ above high bridge
.4byte 3 ; number of sprites .4byte 3 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x32_2 ; unknown .4byte gFieldObjectSpriteOamTable_16x32_2 @ unknown
.4byte 2 ; number of sprites .4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x32_3 ; long grass below high bridge .4byte gFieldObjectSpriteOamTable_16x32_3 @ long grass below high bridge
.4byte 2 ; number of sprites .4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x32_4 ; long grass above high bridge .4byte gFieldObjectSpriteOamTable_16x32_4 @ long grass above high bridge
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_32x32_0: ; 85095D0 gFieldObjectSpriteOamTable_32x32_0: @ 85095D0
sprite_oam -16, -16, 2, 0, 32x32 sprite_oam -16, -16, 2, 0, 32x32
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_32x32_1: ; 85095D4 gFieldObjectSpriteOamTable_32x32_1: @ 85095D4
sprite_oam -16, -16, 1, 0, 32x32 sprite_oam -16, -16, 1, 0, 32x32
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_32x32_2: ; 85095D8 gFieldObjectSpriteOamTable_32x32_2: @ 85095D8
sprite_oam -16, -16, 2, 0, 32x16 sprite_oam -16, -16, 2, 0, 32x16
sprite_oam -16, 0, 2, 8, 32x8 sprite_oam -16, 0, 2, 8, 32x8
sprite_oam -16, 8, 3, 12, 32x8 sprite_oam -16, 8, 3, 12, 32x8
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_32x32_3: ; 85095E4 gFieldObjectSpriteOamTable_32x32_3: @ 85095E4
sprite_oam -16, -16, 2, 0, 32x16 sprite_oam -16, -16, 2, 0, 32x16
sprite_oam -16, 0, 3, 8, 32x16 sprite_oam -16, 0, 3, 8, 32x16
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_32x32_4: ; 85095EC gFieldObjectSpriteOamTable_32x32_4: @ 85095EC
sprite_oam -16, -16, 1, 0, 32x16 sprite_oam -16, -16, 1, 0, 32x16
sprite_oam -16, 0, 3, 8, 32x16 sprite_oam -16, 0, 3, 8, 32x16
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTables_32x32: ; 85095F4 gFieldObjectSpriteOamTables_32x32: @ 85095F4
.4byte 0 ; number of sprites .4byte 0 @ number of sprites
.4byte NULL ; unknown .4byte NULL @ unknown
.4byte 1 ; number of sprites .4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_32x32_0 ; below high bridge .4byte gFieldObjectSpriteOamTable_32x32_0 @ below high bridge
.4byte 1 ; number of sprites .4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_32x32_1 ; above high bridge .4byte gFieldObjectSpriteOamTable_32x32_1 @ above high bridge
.4byte 3 ; number of sprites .4byte 3 @ number of sprites
.4byte gFieldObjectSpriteOamTable_32x32_2 ; unknown .4byte gFieldObjectSpriteOamTable_32x32_2 @ unknown
.4byte 2 ; number of sprites .4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_32x32_3 ; long grass below high bridge .4byte gFieldObjectSpriteOamTable_32x32_3 @ long grass below high bridge
.4byte 2 ; number of sprites .4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_32x32_4 ; long grass above high bridge .4byte gFieldObjectSpriteOamTable_32x32_4 @ long grass above high bridge
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_Truck_0: ; 8509624 gFieldObjectSpriteOamTable_Truck_0: @ 8509624
sprite_oam -24, -24, 2, 0, 32x8 sprite_oam -24, -24, 2, 0, 32x8
sprite_oam 8, -24, 2, 4, 16x8 sprite_oam 8, -24, 2, 4, 16x8
sprite_oam -24, -16, 2, 6, 32x8 sprite_oam -24, -16, 2, 6, 32x8
@@ -213,110 +213,110 @@ gFieldObjectSpriteOamTable_Truck_0: ; 8509624
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTables_Truck: ; 8509654 gFieldObjectSpriteOamTables_Truck: @ 8509654
.4byte 12 ; number of sprites .4byte 12 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Truck_0 ; unknown .4byte gFieldObjectSpriteOamTable_Truck_0 @ unknown
.4byte 12 ; number of sprites .4byte 12 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Truck_0 ; below high bridge .4byte gFieldObjectSpriteOamTable_Truck_0 @ below high bridge
.4byte 12 ; number of sprites .4byte 12 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Truck_0 ; above high bridge .4byte gFieldObjectSpriteOamTable_Truck_0 @ above high bridge
.4byte 12 ; number of sprites .4byte 12 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Truck_0 ; unknown .4byte gFieldObjectSpriteOamTable_Truck_0 @ unknown
.4byte 12 ; number of sprites .4byte 12 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Truck_0 ; long grass below high bridge .4byte gFieldObjectSpriteOamTable_Truck_0 @ long grass below high bridge
.4byte 12 ; number of sprites .4byte 12 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Truck_0 ; long grass above high bridge .4byte gFieldObjectSpriteOamTable_Truck_0 @ long grass above high bridge
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_Unused_0: ; 8509684 gFieldObjectSpriteOamTable_Unused_0: @ 8509684
sprite_oam -32, -16, 2, 0, 64x32 sprite_oam -32, -16, 2, 0, 64x32
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_Unused_1: ; 8509688 gFieldObjectSpriteOamTable_Unused_1: @ 8509688
sprite_oam -32, -16, 1, 0, 64x32 sprite_oam -32, -16, 1, 0, 64x32
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_Unused_2: ; 850968C gFieldObjectSpriteOamTable_Unused_2: @ 850968C
sprite_oam -32, -16, 2, 0, 64x32 sprite_oam -32, -16, 2, 0, 64x32
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_Unused_3: ; 8509690 gFieldObjectSpriteOamTable_Unused_3: @ 8509690
sprite_oam -32, -16, 2, 0, 64x32 sprite_oam -32, -16, 2, 0, 64x32
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTables_Unused: ; 8509694 gFieldObjectSpriteOamTables_Unused: @ 8509694
.4byte 0 ; number of sprites .4byte 0 @ number of sprites
.4byte NULL ; unknown .4byte NULL @ unknown
.4byte 1 ; number of sprites .4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Unused_0 ; below high bridge .4byte gFieldObjectSpriteOamTable_Unused_0 @ below high bridge
.4byte 1 ; number of sprites .4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Unused_1 ; above high bridge .4byte gFieldObjectSpriteOamTable_Unused_1 @ above high bridge
.4byte 1 ; number of sprites .4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Unused_2 ; unknown .4byte gFieldObjectSpriteOamTable_Unused_2 @ unknown
.4byte 1 ; number of sprites .4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Unused_3 ; long grass below high bridge .4byte gFieldObjectSpriteOamTable_Unused_3 @ long grass below high bridge
.4byte 1 ; number of sprites .4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Unused_3 ; long grass above high bridge .4byte gFieldObjectSpriteOamTable_Unused_3 @ long grass above high bridge
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_64x64_0: ; 85096C4 gFieldObjectSpriteOamTable_64x64_0: @ 85096C4
sprite_oam -32, -32, 2, 0, 64x64 sprite_oam -32, -32, 2, 0, 64x64
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_64x64_1: ; 85096C8 gFieldObjectSpriteOamTable_64x64_1: @ 85096C8
sprite_oam -32, -32, 1, 0, 64x64 sprite_oam -32, -32, 1, 0, 64x64
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_64x64_2: ; 85096CC gFieldObjectSpriteOamTable_64x64_2: @ 85096CC
sprite_oam -32, -32, 2, 0, 64x64 sprite_oam -32, -32, 2, 0, 64x64
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_64x64_3: ; 85096D0 gFieldObjectSpriteOamTable_64x64_3: @ 85096D0
sprite_oam -32, -32, 2, 0, 64x64 sprite_oam -32, -32, 2, 0, 64x64
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTables_64x64: ; 85096D4 gFieldObjectSpriteOamTables_64x64: @ 85096D4
.4byte 0 ; number of sprites .4byte 0 @ number of sprites
.4byte NULL ; unknown .4byte NULL @ unknown
.4byte 1 ; number of sprites .4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_64x64_0 ; below high bridge .4byte gFieldObjectSpriteOamTable_64x64_0 @ below high bridge
.4byte 1 ; number of sprites .4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_64x64_1 ; above high bridge .4byte gFieldObjectSpriteOamTable_64x64_1 @ above high bridge
.4byte 1 ; number of sprites .4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_64x64_2 ; unknown .4byte gFieldObjectSpriteOamTable_64x64_2 @ unknown
.4byte 1 ; number of sprites .4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_64x64_3 ; long grass below high bridge .4byte gFieldObjectSpriteOamTable_64x64_3 @ long grass below high bridge
.4byte 1 ; number of sprites .4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_64x64_3 ; long grass above high bridge .4byte gFieldObjectSpriteOamTable_64x64_3 @ long grass above high bridge
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_SSTidal_0: ; 8509704 gFieldObjectSpriteOamTable_SSTidal_0: @ 8509704
sprite_oam -48, -20, 2, 0, 32x8 sprite_oam -48, -20, 2, 0, 32x8
sprite_oam -16, -20, 2, 4, 32x8 sprite_oam -16, -20, 2, 4, 32x8
sprite_oam 16, -20, 2, 8, 32x8 sprite_oam 16, -20, 2, 8, 32x8
@@ -335,7 +335,7 @@ gFieldObjectSpriteOamTable_SSTidal_0: ; 8509704
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_SSTidal_1: ; 8509740 gFieldObjectSpriteOamTable_SSTidal_1: @ 8509740
sprite_oam -48, -20, 1, 0, 32x8 sprite_oam -48, -20, 1, 0, 32x8
sprite_oam -16, -20, 1, 4, 32x8 sprite_oam -16, -20, 1, 4, 32x8
sprite_oam 16, -20, 1, 8, 32x8 sprite_oam 16, -20, 1, 8, 32x8
@@ -354,7 +354,7 @@ gFieldObjectSpriteOamTable_SSTidal_1: ; 8509740
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_SSTidal_2: ; 850977C gFieldObjectSpriteOamTable_SSTidal_2: @ 850977C
sprite_oam -48, -20, 2, 0, 32x8 sprite_oam -48, -20, 2, 0, 32x8
sprite_oam -16, -20, 2, 4, 32x8 sprite_oam -16, -20, 2, 4, 32x8
sprite_oam 16, -20, 2, 8, 32x8 sprite_oam 16, -20, 2, 8, 32x8
@@ -373,7 +373,7 @@ gFieldObjectSpriteOamTable_SSTidal_2: ; 850977C
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_SSTidal_3: ; 85097B8 gFieldObjectSpriteOamTable_SSTidal_3: @ 85097B8
sprite_oam -48, -20, 1, 0, 32x8 sprite_oam -48, -20, 1, 0, 32x8
sprite_oam -16, -20, 1, 4, 32x8 sprite_oam -16, -20, 1, 4, 32x8
sprite_oam 16, -20, 1, 8, 32x8 sprite_oam 16, -20, 1, 8, 32x8
@@ -392,28 +392,28 @@ gFieldObjectSpriteOamTable_SSTidal_3: ; 85097B8
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTables_SSTidal: ; 85097F4 gFieldObjectSpriteOamTables_SSTidal: @ 85097F4
.4byte 15 ; number of sprites .4byte 15 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SSTidal_0 ; unknown .4byte gFieldObjectSpriteOamTable_SSTidal_0 @ unknown
.4byte 15 ; number of sprites .4byte 15 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SSTidal_0 ; below high bridge .4byte gFieldObjectSpriteOamTable_SSTidal_0 @ below high bridge
.4byte 15 ; number of sprites .4byte 15 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SSTidal_1 ; above high bridge .4byte gFieldObjectSpriteOamTable_SSTidal_1 @ above high bridge
.4byte 15 ; number of sprites .4byte 15 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SSTidal_2 ; unknown .4byte gFieldObjectSpriteOamTable_SSTidal_2 @ unknown
.4byte 15 ; number of sprites .4byte 15 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SSTidal_3 ; long grass below high bridge .4byte gFieldObjectSpriteOamTable_SSTidal_3 @ long grass below high bridge
.4byte 15 ; number of sprites .4byte 15 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SSTidal_3 ; long grass above high bridge .4byte gFieldObjectSpriteOamTable_SSTidal_3 @ long grass above high bridge
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_SubmarineShadow_0: ; 8509824 gFieldObjectSpriteOamTable_SubmarineShadow_0: @ 8509824
sprite_oam -48, -20, 2, 0, 32x8 sprite_oam -48, -20, 2, 0, 32x8
sprite_oam -16, -20, 2, 4, 32x8 sprite_oam -16, -20, 2, 4, 32x8
sprite_oam 16, -20, 2, 8, 16x8 sprite_oam 16, -20, 2, 8, 16x8
@@ -433,7 +433,7 @@ gFieldObjectSpriteOamTable_SubmarineShadow_0: ; 8509824
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_SubmarineShadow_1: ; 8509864 gFieldObjectSpriteOamTable_SubmarineShadow_1: @ 8509864
sprite_oam -48, -20, 1, 0, 32x8 sprite_oam -48, -20, 1, 0, 32x8
sprite_oam -16, -20, 1, 4, 32x8 sprite_oam -16, -20, 1, 4, 32x8
sprite_oam 16, -20, 1, 8, 16x8 sprite_oam 16, -20, 1, 8, 16x8
@@ -453,7 +453,7 @@ gFieldObjectSpriteOamTable_SubmarineShadow_1: ; 8509864
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_SubmarineShadow_2: ; 85098A4 gFieldObjectSpriteOamTable_SubmarineShadow_2: @ 85098A4
sprite_oam -48, -20, 2, 0, 32x8 sprite_oam -48, -20, 2, 0, 32x8
sprite_oam -16, -20, 2, 4, 32x8 sprite_oam -16, -20, 2, 4, 32x8
sprite_oam 16, -20, 2, 8, 16x8 sprite_oam 16, -20, 2, 8, 16x8
@@ -473,7 +473,7 @@ gFieldObjectSpriteOamTable_SubmarineShadow_2: ; 85098A4
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTable_SubmarineShadow_3: ; 85098E4 gFieldObjectSpriteOamTable_SubmarineShadow_3: @ 85098E4
sprite_oam -48, -20, 1, 0, 32x8 sprite_oam -48, -20, 1, 0, 32x8
sprite_oam -16, -20, 1, 4, 32x8 sprite_oam -16, -20, 1, 4, 32x8
sprite_oam 16, -20, 1, 8, 16x8 sprite_oam 16, -20, 1, 8, 16x8
@@ -493,21 +493,21 @@ gFieldObjectSpriteOamTable_SubmarineShadow_3: ; 85098E4
.align 2, 0 .align 2, 0
gFieldObjectSpriteOamTables_SubmarineShadow: ; 8509924 gFieldObjectSpriteOamTables_SubmarineShadow: @ 8509924
.4byte 16 ; number of sprites .4byte 16 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SubmarineShadow_0 ; unknown .4byte gFieldObjectSpriteOamTable_SubmarineShadow_0 @ unknown
.4byte 16 ; number of sprites .4byte 16 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SubmarineShadow_0 ; below high bridge .4byte gFieldObjectSpriteOamTable_SubmarineShadow_0 @ below high bridge
.4byte 16 ; number of sprites .4byte 16 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SubmarineShadow_1 ; above high bridge .4byte gFieldObjectSpriteOamTable_SubmarineShadow_1 @ above high bridge
.4byte 16 ; number of sprites .4byte 16 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SubmarineShadow_2 ; unknown .4byte gFieldObjectSpriteOamTable_SubmarineShadow_2 @ unknown
.4byte 16 ; number of sprites .4byte 16 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SubmarineShadow_3 ; long grass below high bridge .4byte gFieldObjectSpriteOamTable_SubmarineShadow_3 @ long grass below high bridge
.4byte 16 ; number of sprites .4byte 16 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SubmarineShadow_3 ; long grass above high bridge .4byte gFieldObjectSpriteOamTable_SubmarineShadow_3 @ long grass above high bridge
data/graphics/field_objects/field_object_pic_tables.s
+219 -219
View File
File diff suppressed because it is too large Load Diff
data/graphics/items/item_graphics.s
+471 -471
View File
File diff suppressed because it is too large Load Diff
data/graphics/items/item_icon_table.s
+379 -379
View File
File diff suppressed because it is too large Load Diff
data/graphics/pokemon/circled_question_mark_graphics.s
+4 -4
View File
@@ -1,19 +1,19 @@
.align 2, 0 .align 2, 0
gMonStillFrontPic_CircledQuestionMark: ; 8C00750 gMonStillFrontPic_CircledQuestionMark: @ 8C00750
.incbin "data/graphics/pokemon/still_front_pics/circled_question_mark_still_front_pic.4bpp.lz" .incbin "data/graphics/pokemon/still_front_pics/circled_question_mark_still_front_pic.4bpp.lz"
.align 2, 0 .align 2, 0
gMonBackPic_CircledQuestionMark: ; 8C00998 gMonBackPic_CircledQuestionMark: @ 8C00998
.incbin "data/graphics/pokemon/back_pics/circled_question_mark_back_pic.4bpp.lz" .incbin "data/graphics/pokemon/back_pics/circled_question_mark_back_pic.4bpp.lz"
.align 2, 0 .align 2, 0
gMonPalette_CircledQuestionMark: ; 8C00BE0 gMonPalette_CircledQuestionMark: @ 8C00BE0
.incbin "data/graphics/pokemon/palettes/circled_question_mark_palette.gbapal.lz" .incbin "data/graphics/pokemon/palettes/circled_question_mark_palette.gbapal.lz"
.align 2, 0 .align 2, 0
gMonShinyPalette_CircledQuestionMark: ; 8C00BF8 gMonShinyPalette_CircledQuestionMark: @ 8C00BF8
.incbin "data/graphics/pokemon/palettes/circled_question_mark_shiny_palette.gbapal.lz" .incbin "data/graphics/pokemon/palettes/circled_question_mark_shiny_palette.gbapal.lz"
data/graphics/pokemon/mon_back_pic_table.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0 .align 2, 0
gMonBackPicTable: ; 83028B8 gMonBackPicTable: @ 83028B8
obj_tiles gMonBackPic_CircledQuestionMark, 0x800, 0 obj_tiles gMonBackPic_CircledQuestionMark, 0x800, 0
obj_tiles gMonBackPic_Bulbasaur, 0x800, 1 obj_tiles gMonBackPic_Bulbasaur, 0x800, 1
obj_tiles gMonBackPic_Ivysaur, 0x800, 2 obj_tiles gMonBackPic_Ivysaur, 0x800, 2
data/graphics/pokemon/mon_footprint_table.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0 .align 2, 0
gMonFootprintTable: ; 856E694 gMonFootprintTable: @ 856E694
.4byte gMonFootprint_Bulbasaur .4byte gMonFootprint_Bulbasaur
.4byte gMonFootprint_Bulbasaur .4byte gMonFootprint_Bulbasaur
.4byte gMonFootprint_Ivysaur .4byte gMonFootprint_Ivysaur
data/graphics/pokemon/mon_front_pic_table.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0 .align 2, 0
gMonFrontPicTable: ; 830A18C gMonFrontPicTable: @ 830A18C
obj_tiles gMonFrontPic_CircledQuestionMark, 0x800, 0 obj_tiles gMonFrontPic_CircledQuestionMark, 0x800, 0
obj_tiles gMonFrontPic_Bulbasaur, 0x800, 1 obj_tiles gMonFrontPic_Bulbasaur, 0x800, 1
obj_tiles gMonFrontPic_Ivysaur, 0x800, 2 obj_tiles gMonFrontPic_Ivysaur, 0x800, 2
data/graphics/pokemon/mon_front_pics.s
+416 -416
View File
File diff suppressed because it is too large Load Diff
data/graphics/pokemon/mon_graphics.s
+2403 -2403
View File
File diff suppressed because it is too large Load Diff
data/graphics/pokemon/mon_icon_palette_indices.s
+441 -441
View File
@@ -1,443 +1,443 @@
.align 2, 0 .align 2, 0
gMonIconPaletteIndices: ; 857C388 gMonIconPaletteIndices: @ 857C388
.byte 0 ; ?????????? .byte 0 @ ??????????
.byte 1 ; Bulbasaur .byte 1 @ Bulbasaur
.byte 1 ; Ivysaur .byte 1 @ Ivysaur
.byte 1 ; Venusaur .byte 1 @ Venusaur
.byte 0 ; Charmander .byte 0 @ Charmander
.byte 0 ; Charmeleon .byte 0 @ Charmeleon
.byte 0 ; Charizard .byte 0 @ Charizard
.byte 0 ; Squirtle .byte 0 @ Squirtle
.byte 2 ; Wartortle .byte 2 @ Wartortle
.byte 2 ; Blastoise .byte 2 @ Blastoise
.byte 1 ; Caterpie .byte 1 @ Caterpie
.byte 1 ; Metapod .byte 1 @ Metapod
.byte 0 ; Butterfree .byte 0 @ Butterfree
.byte 1 ; Weedle .byte 1 @ Weedle
.byte 2 ; Kakuna .byte 2 @ Kakuna
.byte 2 ; Beedrill .byte 2 @ Beedrill
.byte 0 ; Pidgey .byte 0 @ Pidgey
.byte 0 ; Pidgeotto .byte 0 @ Pidgeotto
.byte 0 ; Pidgeot .byte 0 @ Pidgeot
.byte 2 ; Rattata .byte 2 @ Rattata
.byte 1 ; Raticate .byte 1 @ Raticate
.byte 0 ; Spearow .byte 0 @ Spearow
.byte 0 ; Fearow .byte 0 @ Fearow
.byte 2 ; Ekans .byte 2 @ Ekans
.byte 2 ; Arbok .byte 2 @ Arbok
.byte 2 ; Pikachu .byte 2 @ Pikachu
.byte 0 ; Raichu .byte 0 @ Raichu
.byte 2 ; Sandshrew .byte 2 @ Sandshrew
.byte 2 ; Sandslash .byte 2 @ Sandslash
.byte 2 ; Nidoran♀ .byte 2 @ Nidoran♀
.byte 2 ; Nidorina .byte 2 @ Nidorina
.byte 2 ; Nidoqueen .byte 2 @ Nidoqueen
.byte 2 ; Nidoran♂ .byte 2 @ Nidoran♂
.byte 2 ; Nidorino .byte 2 @ Nidorino
.byte 2 ; Nidoking .byte 2 @ Nidoking
.byte 0 ; Clefairy .byte 0 @ Clefairy
.byte 0 ; Clefable .byte 0 @ Clefable
.byte 2 ; Vulpix .byte 2 @ Vulpix
.byte 1 ; Ninetales .byte 1 @ Ninetales
.byte 0 ; Jigglypuff .byte 0 @ Jigglypuff
.byte 0 ; Wigglytuff .byte 0 @ Wigglytuff
.byte 2 ; Zubat .byte 2 @ Zubat
.byte 2 ; Golbat .byte 2 @ Golbat
.byte 1 ; Oddish .byte 1 @ Oddish
.byte 0 ; Gloom .byte 0 @ Gloom
.byte 0 ; Vileplume .byte 0 @ Vileplume
.byte 0 ; Paras .byte 0 @ Paras
.byte 0 ; Parasect .byte 0 @ Parasect
.byte 0 ; Venonat .byte 0 @ Venonat
.byte 2 ; Venomoth .byte 2 @ Venomoth
.byte 2 ; Diglett .byte 2 @ Diglett
.byte 2 ; Dugtrio .byte 2 @ Dugtrio
.byte 1 ; Meowth .byte 1 @ Meowth
.byte 1 ; Persian .byte 1 @ Persian
.byte 1 ; Psyduck .byte 1 @ Psyduck
.byte 2 ; Golduck .byte 2 @ Golduck
.byte 1 ; Mankey .byte 1 @ Mankey
.byte 2 ; Primeape .byte 2 @ Primeape
.byte 0 ; Growlithe .byte 0 @ Growlithe
.byte 0 ; Arcanine .byte 0 @ Arcanine
.byte 0 ; Poliwag .byte 0 @ Poliwag
.byte 0 ; Poliwhirl .byte 0 @ Poliwhirl
.byte 0 ; Poliwrath .byte 0 @ Poliwrath
.byte 2 ; Abra .byte 2 @ Abra
.byte 2 ; Kadabra .byte 2 @ Kadabra
.byte 2 ; Alakazam .byte 2 @ Alakazam
.byte 0 ; Machop .byte 0 @ Machop
.byte 2 ; Machoke .byte 2 @ Machoke
.byte 0 ; Machamp .byte 0 @ Machamp
.byte 1 ; Bellsprout .byte 1 @ Bellsprout
.byte 1 ; Weepinbell .byte 1 @ Weepinbell
.byte 1 ; Victreebel .byte 1 @ Victreebel
.byte 2 ; Tentacool .byte 2 @ Tentacool
.byte 2 ; Tentacruel .byte 2 @ Tentacruel
.byte 1 ; Geodude .byte 1 @ Geodude
.byte 1 ; Graveler .byte 1 @ Graveler
.byte 1 ; Golem .byte 1 @ Golem
.byte 0 ; Ponyta .byte 0 @ Ponyta
.byte 0 ; Rapidash .byte 0 @ Rapidash
.byte 0 ; Slowpoke .byte 0 @ Slowpoke
.byte 0 ; Slowbro .byte 0 @ Slowbro
.byte 0 ; Magnemite .byte 0 @ Magnemite
.byte 0 ; Magneton .byte 0 @ Magneton
.byte 1 ; Farfetch'd .byte 1 @ Farfetch'd
.byte 2 ; Doduo .byte 2 @ Doduo
.byte 2 ; Dodrio .byte 2 @ Dodrio
.byte 2 ; Seel .byte 2 @ Seel
.byte 2 ; Dewgong .byte 2 @ Dewgong
.byte 2 ; Grimer .byte 2 @ Grimer
.byte 2 ; Muk .byte 2 @ Muk
.byte 2 ; Shellder .byte 2 @ Shellder
.byte 2 ; Cloyster .byte 2 @ Cloyster
.byte 2 ; Gastly .byte 2 @ Gastly
.byte 2 ; Haunter .byte 2 @ Haunter
.byte 2 ; Gengar .byte 2 @ Gengar
.byte 2 ; Onix .byte 2 @ Onix
.byte 2 ; Drowzee .byte 2 @ Drowzee
.byte 1 ; Hypno .byte 1 @ Hypno
.byte 2 ; Krabby .byte 2 @ Krabby
.byte 2 ; Kingler .byte 2 @ Kingler
.byte 0 ; Voltorb .byte 0 @ Voltorb
.byte 0 ; Electrode .byte 0 @ Electrode
.byte 0 ; Exeggcute .byte 0 @ Exeggcute
.byte 1 ; Exeggutor .byte 1 @ Exeggutor
.byte 1 ; Cubone .byte 1 @ Cubone
.byte 1 ; Marowak .byte 1 @ Marowak
.byte 2 ; Hitmonlee .byte 2 @ Hitmonlee
.byte 2 ; Hitmonchan .byte 2 @ Hitmonchan
.byte 1 ; Lickitung .byte 1 @ Lickitung
.byte 2 ; Koffing .byte 2 @ Koffing
.byte 2 ; Weezing .byte 2 @ Weezing
.byte 1 ; Rhyhorn .byte 1 @ Rhyhorn
.byte 1 ; Rhydon .byte 1 @ Rhydon
.byte 0 ; Chansey .byte 0 @ Chansey
.byte 0 ; Tangela .byte 0 @ Tangela
.byte 1 ; Kangaskhan .byte 1 @ Kangaskhan
.byte 0 ; Horsea .byte 0 @ Horsea
.byte 0 ; Seadra .byte 0 @ Seadra
.byte 0 ; Goldeen .byte 0 @ Goldeen
.byte 0 ; Seaking .byte 0 @ Seaking
.byte 2 ; Staryu .byte 2 @ Staryu
.byte 2 ; Starmie .byte 2 @ Starmie
.byte 0 ; Mr. mime .byte 0 @ Mr. mime
.byte 1 ; Scyther .byte 1 @ Scyther
.byte 2 ; Jynx .byte 2 @ Jynx
.byte 1 ; Electabuzz .byte 1 @ Electabuzz
.byte 0 ; Magmar .byte 0 @ Magmar
.byte 2 ; Pinsir .byte 2 @ Pinsir
.byte 2 ; Tauros .byte 2 @ Tauros
.byte 0 ; Magikarp .byte 0 @ Magikarp
.byte 0 ; Gyarados .byte 0 @ Gyarados
.byte 2 ; Lapras .byte 2 @ Lapras
.byte 2 ; Ditto .byte 2 @ Ditto
.byte 2 ; Eevee .byte 2 @ Eevee
.byte 0 ; Vaporeon .byte 0 @ Vaporeon
.byte 0 ; Jolteon .byte 0 @ Jolteon
.byte 0 ; Flareon .byte 0 @ Flareon
.byte 0 ; Porygon .byte 0 @ Porygon
.byte 0 ; Omanyte .byte 0 @ Omanyte
.byte 0 ; Omastar .byte 0 @ Omastar
.byte 2 ; Kabuto .byte 2 @ Kabuto
.byte 2 ; Kabutops .byte 2 @ Kabutops
.byte 0 ; Aerodactyl .byte 0 @ Aerodactyl
.byte 1 ; Snorlax .byte 1 @ Snorlax
.byte 0 ; Articuno .byte 0 @ Articuno
.byte 0 ; Zapdos .byte 0 @ Zapdos
.byte 0 ; Moltres .byte 0 @ Moltres
.byte 0 ; Dratini .byte 0 @ Dratini
.byte 0 ; Dragonair .byte 0 @ Dragonair
.byte 2 ; Dragonite .byte 2 @ Dragonite
.byte 2 ; Mewtwo .byte 2 @ Mewtwo
.byte 0 ; Mew .byte 0 @ Mew
.byte 1 ; Chikorita .byte 1 @ Chikorita
.byte 1 ; Bayleef .byte 1 @ Bayleef
.byte 1 ; Meganium .byte 1 @ Meganium
.byte 1 ; Cyndaquil .byte 1 @ Cyndaquil
.byte 1 ; Quilava .byte 1 @ Quilava
.byte 1 ; Typhlosion .byte 1 @ Typhlosion
.byte 2 ; Totodile .byte 2 @ Totodile
.byte 2 ; Croconaw .byte 2 @ Croconaw
.byte 2 ; Feraligatr .byte 2 @ Feraligatr
.byte 2 ; Sentret .byte 2 @ Sentret
.byte 2 ; Furret .byte 2 @ Furret
.byte 2 ; Hoothoot .byte 2 @ Hoothoot
.byte 2 ; Noctowl .byte 2 @ Noctowl
.byte 0 ; Ledyba .byte 0 @ Ledyba
.byte 0 ; Ledian .byte 0 @ Ledian
.byte 1 ; Spinarak .byte 1 @ Spinarak
.byte 0 ; Ariados .byte 0 @ Ariados
.byte 2 ; Crobat .byte 2 @ Crobat
.byte 2 ; Chinchou .byte 2 @ Chinchou
.byte 0 ; Lanturn .byte 0 @ Lanturn
.byte 0 ; Pichu .byte 0 @ Pichu
.byte 0 ; Cleffa .byte 0 @ Cleffa
.byte 1 ; Igglybuff .byte 1 @ Igglybuff
.byte 2 ; Togepi .byte 2 @ Togepi
.byte 2 ; Togetic .byte 2 @ Togetic
.byte 0 ; Natu .byte 0 @ Natu
.byte 0 ; Xatu .byte 0 @ Xatu
.byte 2 ; Mareep .byte 2 @ Mareep
.byte 0 ; Flaaffy .byte 0 @ Flaaffy
.byte 0 ; Ampharos .byte 0 @ Ampharos
.byte 1 ; Bellossom .byte 1 @ Bellossom
.byte 2 ; Marill .byte 2 @ Marill
.byte 2 ; Azumarill .byte 2 @ Azumarill
.byte 1 ; Sudowoodo .byte 1 @ Sudowoodo
.byte 1 ; Politoed .byte 1 @ Politoed
.byte 1 ; Hoppip .byte 1 @ Hoppip
.byte 1 ; Skiploom .byte 1 @ Skiploom
.byte 2 ; Jumpluff .byte 2 @ Jumpluff
.byte 2 ; Aipom .byte 2 @ Aipom
.byte 1 ; Sunkern .byte 1 @ Sunkern
.byte 1 ; Sunflora .byte 1 @ Sunflora
.byte 1 ; Yanma .byte 1 @ Yanma
.byte 0 ; Wooper .byte 0 @ Wooper
.byte 0 ; Quagsire .byte 0 @ Quagsire
.byte 2 ; Espeon .byte 2 @ Espeon
.byte 2 ; Umbreon .byte 2 @ Umbreon
.byte 2 ; Murkrow .byte 2 @ Murkrow
.byte 0 ; Slowking .byte 0 @ Slowking
.byte 0 ; Misdreavus .byte 0 @ Misdreavus
.byte 0 ; Unown A .byte 0 @ Unown A
.byte 0 ; Wobbuffet .byte 0 @ Wobbuffet
.byte 1 ; Girafarig .byte 1 @ Girafarig
.byte 0 ; Pineco .byte 0 @ Pineco
.byte 2 ; Forretress .byte 2 @ Forretress
.byte 2 ; Dunsparce .byte 2 @ Dunsparce
.byte 2 ; Gligar .byte 2 @ Gligar
.byte 0 ; Steelix .byte 0 @ Steelix
.byte 0 ; Snubbull .byte 0 @ Snubbull
.byte 2 ; Granbull .byte 2 @ Granbull
.byte 0 ; Qwilfish .byte 0 @ Qwilfish
.byte 0 ; Scizor .byte 0 @ Scizor
.byte 1 ; Shuckle .byte 1 @ Shuckle
.byte 2 ; Heracross .byte 2 @ Heracross
.byte 0 ; Sneasel .byte 0 @ Sneasel
.byte 0 ; Teddiursa .byte 0 @ Teddiursa
.byte 2 ; Ursaring .byte 2 @ Ursaring
.byte 0 ; Slugma .byte 0 @ Slugma
.byte 0 ; Magcargo .byte 0 @ Magcargo
.byte 2 ; Swinub .byte 2 @ Swinub
.byte 2 ; Piloswine .byte 2 @ Piloswine
.byte 0 ; Corsola .byte 0 @ Corsola
.byte 0 ; Remoraid .byte 0 @ Remoraid
.byte 0 ; Octillery .byte 0 @ Octillery
.byte 0 ; Delibird .byte 0 @ Delibird
.byte 2 ; Mantine .byte 2 @ Mantine
.byte 0 ; Skarmory .byte 0 @ Skarmory
.byte 0 ; Houndour .byte 0 @ Houndour
.byte 0 ; Houndoom .byte 0 @ Houndoom
.byte 0 ; Kingdra .byte 0 @ Kingdra
.byte 0 ; Phanpy .byte 0 @ Phanpy
.byte 0 ; Donphan .byte 0 @ Donphan
.byte 0 ; Porygon2 .byte 0 @ Porygon2
.byte 2 ; Stantler .byte 2 @ Stantler
.byte 1 ; Smeargle .byte 1 @ Smeargle
.byte 2 ; Tyrogue .byte 2 @ Tyrogue
.byte 2 ; Hitmontop .byte 2 @ Hitmontop
.byte 1 ; Smoochum .byte 1 @ Smoochum
.byte 1 ; Elekid .byte 1 @ Elekid
.byte 1 ; Magby .byte 1 @ Magby
.byte 1 ; Miltank .byte 1 @ Miltank
.byte 1 ; Blissey .byte 1 @ Blissey
.byte 0 ; Raikou .byte 0 @ Raikou
.byte 2 ; Entei .byte 2 @ Entei
.byte 0 ; Suicune .byte 0 @ Suicune
.byte 1 ; Larvitar .byte 1 @ Larvitar
.byte 0 ; Pupitar .byte 0 @ Pupitar
.byte 1 ; Tyranitar .byte 1 @ Tyranitar
.byte 0 ; Lugia .byte 0 @ Lugia
.byte 1 ; Ho-Oh .byte 1 @ Ho-Oh
.byte 1 ; Celebi .byte 1 @ Celebi
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 0 ; ? .byte 0 @ ?
.byte 1 ; Treecko .byte 1 @ Treecko
.byte 0 ; Grovyle .byte 0 @ Grovyle
.byte 1 ; Sceptile .byte 1 @ Sceptile
.byte 0 ; Torchic .byte 0 @ Torchic
.byte 0 ; Combusken .byte 0 @ Combusken
.byte 0 ; Blaziken .byte 0 @ Blaziken
.byte 0 ; Mudkip .byte 0 @ Mudkip
.byte 0 ; Marshtomp .byte 0 @ Marshtomp
.byte 0 ; Swampert .byte 0 @ Swampert
.byte 2 ; Poochyena .byte 2 @ Poochyena
.byte 2 ; Mightyena .byte 2 @ Mightyena
.byte 2 ; Zigzagoon .byte 2 @ Zigzagoon
.byte 2 ; Linoone .byte 2 @ Linoone
.byte 0 ; Wurmple .byte 0 @ Wurmple
.byte 2 ; Silcoon .byte 2 @ Silcoon
.byte 0 ; Beautifly .byte 0 @ Beautifly
.byte 2 ; Cascoon .byte 2 @ Cascoon
.byte 1 ; Dustox .byte 1 @ Dustox
.byte 1 ; Lotad .byte 1 @ Lotad
.byte 1 ; Lombre .byte 1 @ Lombre
.byte 1 ; Ludicolo .byte 1 @ Ludicolo
.byte 1 ; Seedot .byte 1 @ Seedot
.byte 1 ; Nuzleaf .byte 1 @ Nuzleaf
.byte 0 ; Shiftry .byte 0 @ Shiftry
.byte 1 ; Nincada .byte 1 @ Nincada
.byte 1 ; Ninjask .byte 1 @ Ninjask
.byte 1 ; Shedinja .byte 1 @ Shedinja
.byte 2 ; Taillow .byte 2 @ Taillow
.byte 2 ; Swellow .byte 2 @ Swellow
.byte 1 ; Shroomish .byte 1 @ Shroomish
.byte 1 ; Breloom .byte 1 @ Breloom
.byte 1 ; Spinda .byte 1 @ Spinda
.byte 0 ; Wingull .byte 0 @ Wingull
.byte 0 ; Pelipper .byte 0 @ Pelipper
.byte 2 ; Surskit .byte 2 @ Surskit
.byte 0 ; Masquerain .byte 0 @ Masquerain
.byte 2 ; Wailmer .byte 2 @ Wailmer
.byte 0 ; Wailord .byte 0 @ Wailord
.byte 0 ; Skitty .byte 0 @ Skitty
.byte 2 ; Delcatty .byte 2 @ Delcatty
.byte 1 ; Kecleon .byte 1 @ Kecleon
.byte 1 ; Baltoy .byte 1 @ Baltoy
.byte 0 ; Claydol .byte 0 @ Claydol
.byte 0 ; Nosepass .byte 0 @ Nosepass
.byte 1 ; Torkoal .byte 1 @ Torkoal
.byte 2 ; Sableye .byte 2 @ Sableye
.byte 0 ; Barboach .byte 0 @ Barboach
.byte 0 ; Whiscash .byte 0 @ Whiscash
.byte 0 ; Luvdisc .byte 0 @ Luvdisc
.byte 0 ; Corphish .byte 0 @ Corphish
.byte 0 ; Crawdaunt .byte 0 @ Crawdaunt
.byte 2 ; Feebas .byte 2 @ Feebas
.byte 0 ; Milotic .byte 0 @ Milotic
.byte 0 ; Carvanha .byte 0 @ Carvanha
.byte 0 ; Sharpedo .byte 0 @ Sharpedo
.byte 1 ; Trapinch .byte 1 @ Trapinch
.byte 1 ; Vibrava .byte 1 @ Vibrava
.byte 1 ; Flygon .byte 1 @ Flygon
.byte 2 ; Makuhita .byte 2 @ Makuhita
.byte 1 ; Hariyama .byte 1 @ Hariyama
.byte 1 ; Electrike .byte 1 @ Electrike
.byte 0 ; Manectric .byte 0 @ Manectric
.byte 1 ; Numel .byte 1 @ Numel
.byte 0 ; Camerupt .byte 0 @ Camerupt
.byte 2 ; Spheal .byte 2 @ Spheal
.byte 2 ; Sealeo .byte 2 @ Sealeo
.byte 0 ; Walrein .byte 0 @ Walrein
.byte 1 ; Cacnea .byte 1 @ Cacnea
.byte 1 ; Cacturne .byte 1 @ Cacturne
.byte 2 ; Snorunt .byte 2 @ Snorunt
.byte 0 ; Glalie .byte 0 @ Glalie
.byte 1 ; Lunatone .byte 1 @ Lunatone
.byte 0 ; Solrock .byte 0 @ Solrock
.byte 2 ; Azurill .byte 2 @ Azurill
.byte 0 ; Spoink .byte 0 @ Spoink
.byte 2 ; Grumpig .byte 2 @ Grumpig
.byte 0 ; Plusle .byte 0 @ Plusle
.byte 0 ; Minun .byte 0 @ Minun
.byte 2 ; Mawile .byte 2 @ Mawile
.byte 0 ; Meditite .byte 0 @ Meditite
.byte 0 ; Medicham .byte 0 @ Medicham
.byte 0 ; Swablu .byte 0 @ Swablu
.byte 0 ; Altaria .byte 0 @ Altaria
.byte 0 ; Wynaut .byte 0 @ Wynaut
.byte 0 ; Duskull .byte 0 @ Duskull
.byte 0 ; Dusclops .byte 0 @ Dusclops
.byte 0 ; Roselia .byte 0 @ Roselia
.byte 2 ; Slakoth .byte 2 @ Slakoth
.byte 2 ; Vigoroth .byte 2 @ Vigoroth
.byte 1 ; Slaking .byte 1 @ Slaking
.byte 1 ; Gulpin .byte 1 @ Gulpin
.byte 2 ; Swalot .byte 2 @ Swalot
.byte 1 ; Tropius .byte 1 @ Tropius
.byte 0 ; Whismur .byte 0 @ Whismur
.byte 2 ; Loudred .byte 2 @ Loudred
.byte 2 ; Exploud .byte 2 @ Exploud
.byte 0 ; Clamperl .byte 0 @ Clamperl
.byte 0 ; Huntail .byte 0 @ Huntail
.byte 0 ; Gorebyss .byte 0 @ Gorebyss
.byte 0 ; Absol .byte 0 @ Absol
.byte 0 ; Shuppet .byte 0 @ Shuppet
.byte 0 ; Banette .byte 0 @ Banette
.byte 2 ; Seviper .byte 2 @ Seviper
.byte 0 ; Zangoose .byte 0 @ Zangoose
.byte 1 ; Relicanth .byte 1 @ Relicanth
.byte 2 ; Aron .byte 2 @ Aron
.byte 2 ; Lairon .byte 2 @ Lairon
.byte 2 ; Aggron .byte 2 @ Aggron
.byte 0 ; Castform .byte 0 @ Castform
.byte 0 ; Volbeat .byte 0 @ Volbeat
.byte 2 ; Illumise .byte 2 @ Illumise
.byte 2 ; Lileep .byte 2 @ Lileep
.byte 0 ; Cradily .byte 0 @ Cradily
.byte 0 ; Anorith .byte 0 @ Anorith
.byte 0 ; Armaldo .byte 0 @ Armaldo
.byte 1 ; Ralts .byte 1 @ Ralts
.byte 1 ; Kirlia .byte 1 @ Kirlia
.byte 1 ; Gardevoir .byte 1 @ Gardevoir
.byte 2 ; Bagon .byte 2 @ Bagon
.byte 2 ; Shelgon .byte 2 @ Shelgon
.byte 0 ; Salamence .byte 0 @ Salamence
.byte 0 ; Beldum .byte 0 @ Beldum
.byte 0 ; Metang .byte 0 @ Metang
.byte 0 ; Metagross .byte 0 @ Metagross
.byte 2 ; Regirock .byte 2 @ Regirock
.byte 2 ; Regice .byte 2 @ Regice
.byte 2 ; Registeel .byte 2 @ Registeel
.byte 2 ; Kyogre .byte 2 @ Kyogre
.byte 0 ; Groudon .byte 0 @ Groudon
.byte 1 ; Rayquaza .byte 1 @ Rayquaza
.byte 0 ; Latias .byte 0 @ Latias
.byte 2 ; Latios .byte 2 @ Latios
.byte 0 ; Jirachi .byte 0 @ Jirachi
.byte 0 ; Deoxys .byte 0 @ Deoxys
.byte 0 ; Chimecho .byte 0 @ Chimecho
.byte 1 ; Egg .byte 1 @ Egg
.byte 0 ; Unown B .byte 0 @ Unown B
.byte 0 ; Unown C .byte 0 @ Unown C
.byte 0 ; Unown D .byte 0 @ Unown D
.byte 0 ; Unown E .byte 0 @ Unown E
.byte 0 ; Unown F .byte 0 @ Unown F
.byte 0 ; Unown G .byte 0 @ Unown G
.byte 0 ; Unown H .byte 0 @ Unown H
.byte 0 ; Unown I .byte 0 @ Unown I
.byte 0 ; Unown J .byte 0 @ Unown J
.byte 0 ; Unown K .byte 0 @ Unown K
.byte 0 ; Unown L .byte 0 @ Unown L
.byte 0 ; Unown M .byte 0 @ Unown M
.byte 0 ; Unown N .byte 0 @ Unown N
.byte 0 ; Unown O .byte 0 @ Unown O
.byte 0 ; Unown P .byte 0 @ Unown P
.byte 0 ; Unown Q .byte 0 @ Unown Q
.byte 0 ; Unown R .byte 0 @ Unown R
.byte 0 ; Unown S .byte 0 @ Unown S
.byte 0 ; Unown T .byte 0 @ Unown T
.byte 0 ; Unown U .byte 0 @ Unown U
.byte 0 ; Unown V .byte 0 @ Unown V
.byte 0 ; Unown W .byte 0 @ Unown W
.byte 0 ; Unown X .byte 0 @ Unown X
.byte 0 ; Unown Y .byte 0 @ Unown Y
.byte 0 ; Unown Z .byte 0 @ Unown Z
.byte 0 ; Unown Exclamation Mark .byte 0 @ Unown Exclamation Mark
.byte 0 ; Unown Question Mark .byte 0 @ Unown Question Mark
data/graphics/pokemon/mon_icon_palette_table.s
+3 -3
View File
@@ -1,12 +1,12 @@
.align 2, 0 .align 2, 0
gMonIconPaletteTable: ; 857C540 gMonIconPaletteTable: @ 857C540
obj_pal gMonIconPalettes + 0 * 32, 56000 obj_pal gMonIconPalettes + 0 * 32, 56000
obj_pal gMonIconPalettes + 1 * 32, 56001 obj_pal gMonIconPalettes + 1 * 32, 56001
obj_pal gMonIconPalettes + 2 * 32, 56002 obj_pal gMonIconPalettes + 2 * 32, 56002
; These palettes are actually part of the title screen BG palette and are not @ These palettes are actually part of the title screen BG palette and are not
; used for Pokémon icons. @ used for Pokémon icons.
obj_pal gMonIconPalettes + 3 * 32, 56003 obj_pal gMonIconPalettes + 3 * 32, 56003
obj_pal gMonIconPalettes + 4 * 32, 56004 obj_pal gMonIconPalettes + 4 * 32, 56004
obj_pal gMonIconPalettes + 5 * 32, 56005 obj_pal gMonIconPalettes + 5 * 32, 56005
data/graphics/pokemon/mon_icon_table.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0 .align 2, 0
gMonIconTable: ; 857BCA8 gMonIconTable: @ 857BCA8
.4byte gMonIcon_Bulbasaur .4byte gMonIcon_Bulbasaur
.4byte gMonIcon_Bulbasaur .4byte gMonIcon_Bulbasaur
.4byte gMonIcon_Ivysaur .4byte gMonIcon_Ivysaur
data/graphics/pokemon/mon_palette_table.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0 .align 2, 0
gMonPaletteTable: ; 8303678 gMonPaletteTable: @ 8303678
obj_pal gMonPalette_CircledQuestionMark, 0 obj_pal gMonPalette_CircledQuestionMark, 0
obj_pal gMonPalette_Bulbasaur, 1 obj_pal gMonPalette_Bulbasaur, 1
obj_pal gMonPalette_Ivysaur, 2 obj_pal gMonPalette_Ivysaur, 2
data/graphics/pokemon/mon_shiny_palette_table.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0 .align 2, 0
gMonShinyPaletteTable: ; 8304438 gMonShinyPaletteTable: @ 8304438
obj_pal gMonShinyPalette_CircledQuestionMark, 500 obj_pal gMonShinyPalette_CircledQuestionMark, 500
obj_pal gMonShinyPalette_Bulbasaur, 501 obj_pal gMonShinyPalette_Bulbasaur, 501
obj_pal gMonShinyPalette_Ivysaur, 502 obj_pal gMonShinyPalette_Ivysaur, 502
data/graphics/pokemon/mon_still_front_pic_table.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0 .align 2, 0
gMonStillFrontPicTable: ; 8301418 gMonStillFrontPicTable: @ 8301418
obj_tiles gMonStillFrontPic_CircledQuestionMark, 0x800, 0 obj_tiles gMonStillFrontPic_CircledQuestionMark, 0x800, 0
obj_tiles gMonStillFrontPic_Bulbasaur, 0x800, 1 obj_tiles gMonStillFrontPic_Bulbasaur, 0x800, 1
obj_tiles gMonStillFrontPic_Ivysaur, 0x800, 2 obj_tiles gMonStillFrontPic_Ivysaur, 0x800, 2
data/graphics/tilesets/metatiles.s
+140 -140
View File
@@ -1,699 +1,699 @@
.align 1, 0 .align 1, 0
gMetatiles_General: ; 83960F0 gMetatiles_General: @ 83960F0
.incbin "base_emerald.gba", 0x3960f0, 0x2000 .incbin "base_emerald.gba", 0x3960f0, 0x2000
.align 1, 0 .align 1, 0
gMetatileAttributes_General: ; 83980F0 gMetatileAttributes_General: @ 83980F0
.incbin "base_emerald.gba", 0x3980f0, 0x400 .incbin "base_emerald.gba", 0x3980f0, 0x400
.align 1, 0 .align 1, 0
gMetatiles_Petalburg: ; 83984F0 gMetatiles_Petalburg: @ 83984F0
.incbin "base_emerald.gba", 0x3984f0, 0x900 .incbin "base_emerald.gba", 0x3984f0, 0x900
.align 1, 0 .align 1, 0
gMetatileAttributes_Petalburg: ; 8398DF0 gMetatileAttributes_Petalburg: @ 8398DF0
.incbin "base_emerald.gba", 0x398df0, 0x120 .incbin "base_emerald.gba", 0x398df0, 0x120
.align 1, 0 .align 1, 0
gMetatiles_Rustboro: ; 8398F10 gMetatiles_Rustboro: @ 8398F10
.incbin "base_emerald.gba", 0x398f10, 0x15e0 .incbin "base_emerald.gba", 0x398f10, 0x15e0
.align 1, 0 .align 1, 0
gMetatileAttributes_Rustboro: ; 839A4F0 gMetatileAttributes_Rustboro: @ 839A4F0
.incbin "base_emerald.gba", 0x39a4f0, 0x2bc .incbin "base_emerald.gba", 0x39a4f0, 0x2bc
.align 1, 0 .align 1, 0
gMetatiles_Dewford: ; 839A7AC gMetatiles_Dewford: @ 839A7AC
.incbin "base_emerald.gba", 0x39a7ac, 0x17b0 .incbin "base_emerald.gba", 0x39a7ac, 0x17b0
.align 1, 0 .align 1, 0
gMetatileAttributes_Dewford: ; 839BF5C gMetatileAttributes_Dewford: @ 839BF5C
.incbin "base_emerald.gba", 0x39bf5c, 0x2f6 .incbin "base_emerald.gba", 0x39bf5c, 0x2f6
.align 1, 0 .align 1, 0
gMetatiles_Slateport: ; 839C252 gMetatiles_Slateport: @ 839C252
.incbin "base_emerald.gba", 0x39c252, 0x1960 .incbin "base_emerald.gba", 0x39c252, 0x1960
.align 1, 0 .align 1, 0
gMetatileAttributes_Slateport: ; 839DBB2 gMetatileAttributes_Slateport: @ 839DBB2
.incbin "base_emerald.gba", 0x39dbb2, 0x32c .incbin "base_emerald.gba", 0x39dbb2, 0x32c
.align 1, 0 .align 1, 0
gMetatiles_Mauville: ; 839DEDE gMetatiles_Mauville: @ 839DEDE
.incbin "base_emerald.gba", 0x39dede, 0x1fe0 .incbin "base_emerald.gba", 0x39dede, 0x1fe0
.align 1, 0 .align 1, 0
gMetatileAttributes_Mauville: ; 839FEBE gMetatileAttributes_Mauville: @ 839FEBE
.incbin "base_emerald.gba", 0x39febe, 0x3fc .incbin "base_emerald.gba", 0x39febe, 0x3fc
.align 1, 0 .align 1, 0
gMetatiles_Lavaridge: ; 83A02BA gMetatiles_Lavaridge: @ 83A02BA
.incbin "base_emerald.gba", 0x3a02ba, 0x1b90 .incbin "base_emerald.gba", 0x3a02ba, 0x1b90
.align 1, 0 .align 1, 0
gMetatileAttributes_Lavaridge: ; 83A1E4A gMetatileAttributes_Lavaridge: @ 83A1E4A
.incbin "base_emerald.gba", 0x3a1e4a, 0x372 .incbin "base_emerald.gba", 0x3a1e4a, 0x372
.align 1, 0 .align 1, 0
gMetatiles_Fallarbor: ; 83A21BC gMetatiles_Fallarbor: @ 83A21BC
.incbin "base_emerald.gba", 0x3a21bc, 0x16f0 .incbin "base_emerald.gba", 0x3a21bc, 0x16f0
.align 1, 0 .align 1, 0
gMetatileAttributes_Fallarbor: ; 83A38AC gMetatileAttributes_Fallarbor: @ 83A38AC
.incbin "base_emerald.gba", 0x3a38ac, 0x2de .incbin "base_emerald.gba", 0x3a38ac, 0x2de
.align 1, 0 .align 1, 0
gMetatiles_Fortree: ; 83A3B8A gMetatiles_Fortree: @ 83A3B8A
.incbin "base_emerald.gba", 0x3a3b8a, 0x1180 .incbin "base_emerald.gba", 0x3a3b8a, 0x1180
.align 1, 0 .align 1, 0
gMetatileAttributes_Fortree: ; 83A4D0A gMetatileAttributes_Fortree: @ 83A4D0A
.incbin "base_emerald.gba", 0x3a4d0a, 0x230 .incbin "base_emerald.gba", 0x3a4d0a, 0x230
.align 1, 0 .align 1, 0
gMetatiles_Lilycove: ; 83A4F3A gMetatiles_Lilycove: @ 83A4F3A
.incbin "base_emerald.gba", 0x3a4f3a, 0x15f0 .incbin "base_emerald.gba", 0x3a4f3a, 0x15f0
.align 1, 0 .align 1, 0
gMetatileAttributes_Lilycove: ; 83A652A gMetatileAttributes_Lilycove: @ 83A652A
.incbin "base_emerald.gba", 0x3a652a, 0x2be .incbin "base_emerald.gba", 0x3a652a, 0x2be
.align 1, 0 .align 1, 0
gMetatiles_Mossdeep: ; 83A67E8 gMetatiles_Mossdeep: @ 83A67E8
.incbin "base_emerald.gba", 0x3a67e8, 0x1c60 .incbin "base_emerald.gba", 0x3a67e8, 0x1c60
.align 1, 0 .align 1, 0
gMetatileAttributes_Mossdeep: ; 83A8448 gMetatileAttributes_Mossdeep: @ 83A8448
.incbin "base_emerald.gba", 0x3a8448, 0x38c .incbin "base_emerald.gba", 0x3a8448, 0x38c
.align 1, 0 .align 1, 0
gMetatiles_EverGrande: ; 83A87D4 gMetatiles_EverGrande: @ 83A87D4
.incbin "base_emerald.gba", 0x3a87d4, 0xa80 .incbin "base_emerald.gba", 0x3a87d4, 0xa80
.align 1, 0 .align 1, 0
gMetatileAttributes_EverGrande: ; 83A9254 gMetatileAttributes_EverGrande: @ 83A9254
.incbin "base_emerald.gba", 0x3a9254, 0x150 .incbin "base_emerald.gba", 0x3a9254, 0x150
.align 1, 0 .align 1, 0
gMetatiles_Pacifidlog: ; 83A93A4 gMetatiles_Pacifidlog: @ 83A93A4
.incbin "base_emerald.gba", 0x3a93a4, 0xcb0 .incbin "base_emerald.gba", 0x3a93a4, 0xcb0
.align 1, 0 .align 1, 0
gMetatileAttributes_Pacifidlog: ; 83AA054 gMetatileAttributes_Pacifidlog: @ 83AA054
.incbin "base_emerald.gba", 0x3aa054, 0x196 .incbin "base_emerald.gba", 0x3aa054, 0x196
.align 1, 0 .align 1, 0
gMetatiles_Sootopolis: ; 83AA1EA gMetatiles_Sootopolis: @ 83AA1EA
.incbin "base_emerald.gba", 0x3aa1ea, 0xfe0 .incbin "base_emerald.gba", 0x3aa1ea, 0xfe0
.align 1, 0 .align 1, 0
gMetatileAttributes_Sootopolis: ; 83AB1CA gMetatileAttributes_Sootopolis: @ 83AB1CA
.incbin "base_emerald.gba", 0x3ab1ca, 0x1fc .incbin "base_emerald.gba", 0x3ab1ca, 0x1fc
.align 1, 0 .align 1, 0
gMetatiles_BattleFrontierOutsideWest: ; 83AB3C6 gMetatiles_BattleFrontierOutsideWest: @ 83AB3C6
.incbin "base_emerald.gba", 0x3ab3c6, 0x1fe0 .incbin "base_emerald.gba", 0x3ab3c6, 0x1fe0
.align 1, 0 .align 1, 0
gMetatileAttributes_BattleFrontierOutsideWest: ; 83AD3A6 gMetatileAttributes_BattleFrontierOutsideWest: @ 83AD3A6
.incbin "base_emerald.gba", 0x3ad3a6, 0x3fc .incbin "base_emerald.gba", 0x3ad3a6, 0x3fc
.align 1, 0 .align 1, 0
gMetatiles_BattleFrontierOutsideEast: ; 83AD7A2 gMetatiles_BattleFrontierOutsideEast: @ 83AD7A2
.incbin "base_emerald.gba", 0x3ad7a2, 0x1fe0 .incbin "base_emerald.gba", 0x3ad7a2, 0x1fe0
.align 1, 0 .align 1, 0
gMetatileAttributes_BattleFrontierOutsideEast: ; 83AF782 gMetatileAttributes_BattleFrontierOutsideEast: @ 83AF782
.incbin "base_emerald.gba", 0x3af782, 0x3fc .incbin "base_emerald.gba", 0x3af782, 0x3fc
.align 1, 0 .align 1, 0
gMetatiles_InsideBuilding: ; 83AFB7E gMetatiles_InsideBuilding: @ 83AFB7E
.incbin "base_emerald.gba", 0x3afb7e, 0x80 .incbin "base_emerald.gba", 0x3afb7e, 0x80
.align 1, 0 .align 1, 0
gMetatileAttributes_InsideBuilding: ; 83AFBFE gMetatileAttributes_InsideBuilding: @ 83AFBFE
.incbin "base_emerald.gba", 0x3afbfe, 0x10 .incbin "base_emerald.gba", 0x3afbfe, 0x10
.align 1, 0 .align 1, 0
gMetatiles_Shop: ; 83AFC0E gMetatiles_Shop: @ 83AFC0E
.incbin "base_emerald.gba", 0x3afc0e, 0x1210 .incbin "base_emerald.gba", 0x3afc0e, 0x1210
.align 1, 0 .align 1, 0
gMetatileAttributes_Shop: ; 83B0E1E gMetatileAttributes_Shop: @ 83B0E1E
.incbin "base_emerald.gba", 0x3b0e1e, 0x242 .incbin "base_emerald.gba", 0x3b0e1e, 0x242
.align 1, 0 .align 1, 0
gMetatiles_PokemonCenter: ; 83B1060 gMetatiles_PokemonCenter: @ 83B1060
.incbin "base_emerald.gba", 0x3b1060, 0xe80 .incbin "base_emerald.gba", 0x3b1060, 0xe80
.align 1, 0 .align 1, 0
gMetatileAttributes_PokemonCenter: ; 83B1EE0 gMetatileAttributes_PokemonCenter: @ 83B1EE0
.incbin "base_emerald.gba", 0x3b1ee0, 0x1d0 .incbin "base_emerald.gba", 0x3b1ee0, 0x1d0
.align 1, 0 .align 1, 0
gMetatiles_Cave: ; 83B20B0 gMetatiles_Cave: @ 83B20B0
.incbin "base_emerald.gba", 0x3b20b0, 0x19e0 .incbin "base_emerald.gba", 0x3b20b0, 0x19e0
.align 1, 0 .align 1, 0
gMetatileAttributes_Cave: ; 83B3A90 gMetatileAttributes_Cave: @ 83B3A90
.incbin "base_emerald.gba", 0x3b3a90, 0x33c .incbin "base_emerald.gba", 0x3b3a90, 0x33c
.align 1, 0 .align 1, 0
gMetatiles_PokemonSchool: ; 83B3DCC gMetatiles_PokemonSchool: @ 83B3DCC
.incbin "base_emerald.gba", 0x3b3dcc, 0x3a0 .incbin "base_emerald.gba", 0x3b3dcc, 0x3a0
.align 1, 0 .align 1, 0
gMetatileAttributes_PokemonSchool: ; 83B416C gMetatileAttributes_PokemonSchool: @ 83B416C
.incbin "base_emerald.gba", 0x3b416c, 0x74 .incbin "base_emerald.gba", 0x3b416c, 0x74
.align 1, 0 .align 1, 0
gMetatiles_PokemonFanClub: ; 83B41E0 gMetatiles_PokemonFanClub: @ 83B41E0
.incbin "base_emerald.gba", 0x3b41e0, 0x680 .incbin "base_emerald.gba", 0x3b41e0, 0x680
.align 1, 0 .align 1, 0
gMetatileAttributes_PokemonFanClub: ; 83B4860 gMetatileAttributes_PokemonFanClub: @ 83B4860
.incbin "base_emerald.gba", 0x3b4860, 0xd0 .incbin "base_emerald.gba", 0x3b4860, 0xd0
.align 1, 0 .align 1, 0
gMetatiles_Unused1: ; 83B4930 gMetatiles_Unused1: @ 83B4930
.incbin "base_emerald.gba", 0x3b4930, 0x20 .incbin "base_emerald.gba", 0x3b4930, 0x20
.align 1, 0 .align 1, 0
gMetatileAttributes_Unused1: ; 83B4950 gMetatileAttributes_Unused1: @ 83B4950
.incbin "base_emerald.gba", 0x3b4950, 0x4 .incbin "base_emerald.gba", 0x3b4950, 0x4
.align 1, 0 .align 1, 0
gMetatiles_MeteorFalls: ; 83B4954 gMetatiles_MeteorFalls: @ 83B4954
.incbin "base_emerald.gba", 0x3b4954, 0x9f0 .incbin "base_emerald.gba", 0x3b4954, 0x9f0
.align 1, 0 .align 1, 0
gMetatileAttributes_MeteorFalls: ; 83B5344 gMetatileAttributes_MeteorFalls: @ 83B5344
.incbin "base_emerald.gba", 0x3b5344, 0x13e .incbin "base_emerald.gba", 0x3b5344, 0x13e
.align 1, 0 .align 1, 0
gMetatiles_OceanicMuseum: ; 83B5482 gMetatiles_OceanicMuseum: @ 83B5482
.incbin "base_emerald.gba", 0x3b5482, 0x7a0 .incbin "base_emerald.gba", 0x3b5482, 0x7a0
.align 1, 0 .align 1, 0
gMetatileAttributes_OceanicMuseum: ; 83B5C22 gMetatileAttributes_OceanicMuseum: @ 83B5C22
.incbin "base_emerald.gba", 0x3b5c22, 0xf4 .incbin "base_emerald.gba", 0x3b5c22, 0xf4
.align 1, 0 .align 1, 0
gMetatiles_CableClub: ; 83B5D16 gMetatiles_CableClub: @ 83B5D16
.incbin "base_emerald.gba", 0x3b5d16, 0x1000 .incbin "base_emerald.gba", 0x3b5d16, 0x1000
.align 1, 0 .align 1, 0
gMetatileAttributes_CableClub: ; 83B6D16 gMetatileAttributes_CableClub: @ 83B6D16
.incbin "base_emerald.gba", 0x3b6d16, 0x200 .incbin "base_emerald.gba", 0x3b6d16, 0x200
.align 1, 0 .align 1, 0
gMetatiles_SeashoreHouse: ; 83B6F16 gMetatiles_SeashoreHouse: @ 83B6F16
.incbin "base_emerald.gba", 0x3b6f16, 0x380 .incbin "base_emerald.gba", 0x3b6f16, 0x380
.align 1, 0 .align 1, 0
gMetatileAttributes_SeashoreHouse: ; 83B7296 gMetatileAttributes_SeashoreHouse: @ 83B7296
.incbin "base_emerald.gba", 0x3b7296, 0x70 .incbin "base_emerald.gba", 0x3b7296, 0x70
.align 1, 0 .align 1, 0
gMetatiles_PrettyPetalFlowerShop: ; 83B7306 gMetatiles_PrettyPetalFlowerShop: @ 83B7306
.incbin "base_emerald.gba", 0x3b7306, 0x480 .incbin "base_emerald.gba", 0x3b7306, 0x480
.align 1, 0 .align 1, 0
gMetatileAttributes_PrettyPetalFlowerShop: ; 83B7786 gMetatileAttributes_PrettyPetalFlowerShop: @ 83B7786
.incbin "base_emerald.gba", 0x3b7786, 0x90 .incbin "base_emerald.gba", 0x3b7786, 0x90
.align 1, 0 .align 1, 0
gMetatiles_PokemonDayCare: ; 83B7816 gMetatiles_PokemonDayCare: @ 83B7816
.incbin "base_emerald.gba", 0x3b7816, 0x440 .incbin "base_emerald.gba", 0x3b7816, 0x440
.align 1, 0 .align 1, 0
gMetatileAttributes_PokemonDayCare: ; 83B7C56 gMetatileAttributes_PokemonDayCare: @ 83B7C56
.incbin "base_emerald.gba", 0x3b7c56, 0x88 .incbin "base_emerald.gba", 0x3b7c56, 0x88
.align 1, 0 .align 1, 0
gMetatiles_Facility: ; 83B7CDE gMetatiles_Facility: @ 83B7CDE
.incbin "base_emerald.gba", 0x3b7cde, 0x1ff0 .incbin "base_emerald.gba", 0x3b7cde, 0x1ff0
.align 1, 0 .align 1, 0
gMetatileAttributes_Facility: ; 83B9CCE gMetatileAttributes_Facility: @ 83B9CCE
.incbin "base_emerald.gba", 0x3b9cce, 0x3fe .incbin "base_emerald.gba", 0x3b9cce, 0x3fe
.align 1, 0 .align 1, 0
gMetatiles_BikeShop: ; 83BA0CC gMetatiles_BikeShop: @ 83BA0CC
.incbin "base_emerald.gba", 0x3ba0cc, 0xf80 .incbin "base_emerald.gba", 0x3ba0cc, 0xf80
.align 1, 0 .align 1, 0
gMetatileAttributes_BikeShop: ; 83BB04C gMetatileAttributes_BikeShop: @ 83BB04C
.incbin "base_emerald.gba", 0x3bb04c, 0x1f0 .incbin "base_emerald.gba", 0x3bb04c, 0x1f0
.align 1, 0 .align 1, 0
gMetatiles_RusturfTunnel: ; 83BB23C gMetatiles_RusturfTunnel: @ 83BB23C
.incbin "base_emerald.gba", 0x3bb23c, 0x530 .incbin "base_emerald.gba", 0x3bb23c, 0x530
.align 1, 0 .align 1, 0
gMetatileAttributes_RusturfTunnel: ; 83BB76C gMetatileAttributes_RusturfTunnel: @ 83BB76C
.incbin "base_emerald.gba", 0x3bb76c, 0xa6 .incbin "base_emerald.gba", 0x3bb76c, 0xa6
.align 1, 0 .align 1, 0
gMetatiles_SecretBaseSecondary: ; 83BB812 gMetatiles_SecretBaseSecondary: @ 83BB812
.incbin "base_emerald.gba", 0x3bb812, 0x1440 .incbin "base_emerald.gba", 0x3bb812, 0x1440
.align 1, 0 .align 1, 0
gMetatileAttributes_SecretBaseSecondary: ; 83BCC52 gMetatileAttributes_SecretBaseSecondary: @ 83BCC52
.incbin "base_emerald.gba", 0x3bcc52, 0x288 .incbin "base_emerald.gba", 0x3bcc52, 0x288
.align 1, 0 .align 1, 0
gMetatiles_InsideOfTruck: ; 83BCEDA gMetatiles_InsideOfTruck: @ 83BCEDA
.incbin "base_emerald.gba", 0x3bceda, 0x260 .incbin "base_emerald.gba", 0x3bceda, 0x260
.align 1, 0 .align 1, 0
gMetatileAttributes_InsideOfTruck: ; 83BD13A gMetatileAttributes_InsideOfTruck: @ 83BD13A
.incbin "base_emerald.gba", 0x3bd13a, 0x4c .incbin "base_emerald.gba", 0x3bd13a, 0x4c
.align 1, 0 .align 1, 0
gMetatiles_Contest: ; 83BD186 gMetatiles_Contest: @ 83BD186
.incbin "base_emerald.gba", 0x3bd186, 0xe90 .incbin "base_emerald.gba", 0x3bd186, 0xe90
.align 1, 0 .align 1, 0
gMetatileAttributes_Contest: ; 83BE016 gMetatileAttributes_Contest: @ 83BE016
.incbin "base_emerald.gba", 0x3be016, 0x1d2 .incbin "base_emerald.gba", 0x3be016, 0x1d2
.align 1, 0 .align 1, 0
gMetatiles_LilycoveMuseum: ; 83BE1E8 gMetatiles_LilycoveMuseum: @ 83BE1E8
.incbin "base_emerald.gba", 0x3be1e8, 0x8f0 .incbin "base_emerald.gba", 0x3be1e8, 0x8f0
.align 1, 0 .align 1, 0
gMetatileAttributes_LilycoveMuseum: ; 83BEAD8 gMetatileAttributes_LilycoveMuseum: @ 83BEAD8
.incbin "base_emerald.gba", 0x3bead8, 0x11e .incbin "base_emerald.gba", 0x3bead8, 0x11e
.align 1, 0 .align 1, 0
gMetatiles_BrendansMaysHouse: ; 83BEBF6 gMetatiles_BrendansMaysHouse: @ 83BEBF6
.incbin "base_emerald.gba", 0x3bebf6, 0xc40 .incbin "base_emerald.gba", 0x3bebf6, 0xc40
.align 1, 0 .align 1, 0
gMetatileAttributes_BrendansMaysHouse: ; 83BF836 gMetatileAttributes_BrendansMaysHouse: @ 83BF836
.incbin "base_emerald.gba", 0x3bf836, 0x188 .incbin "base_emerald.gba", 0x3bf836, 0x188
.align 1, 0 .align 1, 0
gMetatiles_Lab: ; 83BF9BE gMetatiles_Lab: @ 83BF9BE
.incbin "base_emerald.gba", 0x3bf9be, 0x9e0 .incbin "base_emerald.gba", 0x3bf9be, 0x9e0
.align 1, 0 .align 1, 0
gMetatileAttributes_Lab: ; 83C039E gMetatileAttributes_Lab: @ 83C039E
.incbin "base_emerald.gba", 0x3c039e, 0x13c .incbin "base_emerald.gba", 0x3c039e, 0x13c
.align 1, 0 .align 1, 0
gMetatiles_Underwater: ; 83C04DA gMetatiles_Underwater: @ 83C04DA
.incbin "base_emerald.gba", 0x3c04da, 0xec0 .incbin "base_emerald.gba", 0x3c04da, 0xec0
.align 1, 0 .align 1, 0
gMetatileAttributes_Underwater: ; 83C139A gMetatileAttributes_Underwater: @ 83C139A
.incbin "base_emerald.gba", 0x3c139a, 0x1d8 .incbin "base_emerald.gba", 0x3c139a, 0x1d8
.align 1, 0 .align 1, 0
gMetatiles_GenericBuilding: ; 83C1572 gMetatiles_GenericBuilding: @ 83C1572
.incbin "base_emerald.gba", 0x3c1572, 0x2000 .incbin "base_emerald.gba", 0x3c1572, 0x2000
.align 1, 0 .align 1, 0
gMetatileAttributes_GenericBuilding: ; 83C3572 gMetatileAttributes_GenericBuilding: @ 83C3572
.incbin "base_emerald.gba", 0x3c3572, 0x400 .incbin "base_emerald.gba", 0x3c3572, 0x400
.align 1, 0 .align 1, 0
gMetatiles_MauvilleGameCorner: ; 83C3972 gMetatiles_MauvilleGameCorner: @ 83C3972
.incbin "base_emerald.gba", 0x3c3972, 0x600 .incbin "base_emerald.gba", 0x3c3972, 0x600
.align 1, 0 .align 1, 0
gMetatileAttributes_MauvilleGameCorner: ; 83C3F72 gMetatileAttributes_MauvilleGameCorner: @ 83C3F72
.incbin "base_emerald.gba", 0x3c3f72, 0xc0 .incbin "base_emerald.gba", 0x3c3f72, 0xc0
.align 1, 0 .align 1, 0
gMetatiles_Unused2: ; 83C4032 gMetatiles_Unused2: @ 83C4032
.incbin "base_emerald.gba", 0x3c4032, 0x3a0 .incbin "base_emerald.gba", 0x3c4032, 0x3a0
.align 1, 0 .align 1, 0
gMetatileAttributes_Unused2: ; 83C43D2 gMetatileAttributes_Unused2: @ 83C43D2
.incbin "base_emerald.gba", 0x3c43d2, 0x74 .incbin "base_emerald.gba", 0x3c43d2, 0x74
.align 1, 0 .align 1, 0
gMetatiles_RustboroGym: ; 83C4446 gMetatiles_RustboroGym: @ 83C4446
.incbin "base_emerald.gba", 0x3c4446, 0x380 .incbin "base_emerald.gba", 0x3c4446, 0x380
.align 1, 0 .align 1, 0
gMetatileAttributes_RustboroGym: ; 83C47C6 gMetatileAttributes_RustboroGym: @ 83C47C6
.incbin "base_emerald.gba", 0x3c47c6, 0x70 .incbin "base_emerald.gba", 0x3c47c6, 0x70
.align 1, 0 .align 1, 0
gMetatiles_DewfordGym: ; 83C4836 gMetatiles_DewfordGym: @ 83C4836
.incbin "base_emerald.gba", 0x3c4836, 0x450 .incbin "base_emerald.gba", 0x3c4836, 0x450
.align 1, 0 .align 1, 0
gMetatileAttributes_DewfordGym: ; 83C4C86 gMetatileAttributes_DewfordGym: @ 83C4C86
.incbin "base_emerald.gba", 0x3c4c86, 0x8a .incbin "base_emerald.gba", 0x3c4c86, 0x8a
.align 1, 0 .align 1, 0
gMetatiles_MauvilleGym: ; 83C4D10 gMetatiles_MauvilleGym: @ 83C4D10
.incbin "base_emerald.gba", 0x3c4d10, 0x750 .incbin "base_emerald.gba", 0x3c4d10, 0x750
.align 1, 0 .align 1, 0
gMetatileAttributes_MauvilleGym: ; 83C5460 gMetatileAttributes_MauvilleGym: @ 83C5460
.incbin "base_emerald.gba", 0x3c5460, 0xea .incbin "base_emerald.gba", 0x3c5460, 0xea
.align 1, 0 .align 1, 0
gMetatiles_LavaridgeGym: ; 83C554A gMetatiles_LavaridgeGym: @ 83C554A
.incbin "base_emerald.gba", 0x3c554a, 0x3d0 .incbin "base_emerald.gba", 0x3c554a, 0x3d0
.align 1, 0 .align 1, 0
gMetatileAttributes_LavaridgeGym: ; 83C591A gMetatileAttributes_LavaridgeGym: @ 83C591A
.incbin "base_emerald.gba", 0x3c591a, 0x7a .incbin "base_emerald.gba", 0x3c591a, 0x7a
.align 1, 0 .align 1, 0
gMetatiles_PetalburgGym: ; 83C5994 gMetatiles_PetalburgGym: @ 83C5994
.incbin "base_emerald.gba", 0x3c5994, 0xe00 .incbin "base_emerald.gba", 0x3c5994, 0xe00
.align 1, 0 .align 1, 0
gMetatileAttributes_PetalburgGym: ; 83C6794 gMetatileAttributes_PetalburgGym: @ 83C6794
.incbin "base_emerald.gba", 0x3c6794, 0x1c0 .incbin "base_emerald.gba", 0x3c6794, 0x1c0
.align 1, 0 .align 1, 0
gMetatiles_FortreeGym: ; 83C6954 gMetatiles_FortreeGym: @ 83C6954
.incbin "base_emerald.gba", 0x3c6954, 0x500 .incbin "base_emerald.gba", 0x3c6954, 0x500
.align 1, 0 .align 1, 0
gMetatileAttributes_FortreeGym: ; 83C6E54 gMetatileAttributes_FortreeGym: @ 83C6E54
.incbin "base_emerald.gba", 0x3c6e54, 0xa0 .incbin "base_emerald.gba", 0x3c6e54, 0xa0
.align 1, 0 .align 1, 0
gMetatiles_MossdeepGym: ; 83C6EF4 gMetatiles_MossdeepGym: @ 83C6EF4
.incbin "base_emerald.gba", 0x3c6ef4, 0x750 .incbin "base_emerald.gba", 0x3c6ef4, 0x750
.align 1, 0 .align 1, 0
gMetatileAttributes_MossdeepGym: ; 83C7644 gMetatileAttributes_MossdeepGym: @ 83C7644
.incbin "base_emerald.gba", 0x3c7644, 0xea .incbin "base_emerald.gba", 0x3c7644, 0xea
.align 1, 0 .align 1, 0
gMetatiles_SootopolisGym: ; 83C772E gMetatiles_SootopolisGym: @ 83C772E
.incbin "base_emerald.gba", 0x3c772e, 0x7a0 .incbin "base_emerald.gba", 0x3c772e, 0x7a0
.align 1, 0 .align 1, 0
gMetatileAttributes_SootopolisGym: ; 83C7ECE gMetatileAttributes_SootopolisGym: @ 83C7ECE
.incbin "base_emerald.gba", 0x3c7ece, 0xf4 .incbin "base_emerald.gba", 0x3c7ece, 0xf4
.align 1, 0 .align 1, 0
gMetatiles_TrickHousePuzzle: ; 83C7FC2 gMetatiles_TrickHousePuzzle: @ 83C7FC2
.incbin "base_emerald.gba", 0x3c7fc2, 0xbd0 .incbin "base_emerald.gba", 0x3c7fc2, 0xbd0
.align 1, 0 .align 1, 0
gMetatileAttributes_TrickHousePuzzle: ; 83C8B92 gMetatileAttributes_TrickHousePuzzle: @ 83C8B92
.incbin "base_emerald.gba", 0x3c8b92, 0x17a .incbin "base_emerald.gba", 0x3c8b92, 0x17a
.align 1, 0 .align 1, 0
gMetatiles_InsideShip: ; 83C8D0C gMetatiles_InsideShip: @ 83C8D0C
.incbin "base_emerald.gba", 0x3c8d0c, 0xfc0 .incbin "base_emerald.gba", 0x3c8d0c, 0xfc0
.align 1, 0 .align 1, 0
gMetatileAttributes_InsideShip: ; 83C9CCC gMetatileAttributes_InsideShip: @ 83C9CCC
.incbin "base_emerald.gba", 0x3c9ccc, 0x1f8 .incbin "base_emerald.gba", 0x3c9ccc, 0x1f8
.align 1, 0 .align 1, 0
gMetatiles_SecretBasePrimary: ; 83C9EC4 gMetatiles_SecretBasePrimary: @ 83C9EC4
.incbin "base_emerald.gba", 0x3c9ec4, 0x20 .incbin "base_emerald.gba", 0x3c9ec4, 0x20
.align 1, 0 .align 1, 0
gMetatileAttributes_SecretBasePrimary: ; 83C9EE4 gMetatileAttributes_SecretBasePrimary: @ 83C9EE4
.incbin "base_emerald.gba", 0x3c9ee4, 0x4 .incbin "base_emerald.gba", 0x3c9ee4, 0x4
.align 1, 0 .align 1, 0
gMetatiles_EliteFour: ; 83C9EE8 gMetatiles_EliteFour: @ 83C9EE8
.incbin "base_emerald.gba", 0x3c9ee8, 0x14c0 .incbin "base_emerald.gba", 0x3c9ee8, 0x14c0
.align 1, 0 .align 1, 0
gMetatileAttributes_EliteFour: ; 83CB3A8 gMetatileAttributes_EliteFour: @ 83CB3A8
.incbin "base_emerald.gba", 0x3cb3a8, 0x298 .incbin "base_emerald.gba", 0x3cb3a8, 0x298
.align 1, 0 .align 1, 0
gMetatiles_BattleFrontier: ; 83CB640 gMetatiles_BattleFrontier: @ 83CB640
.incbin "base_emerald.gba", 0x3cb640, 0x1fd0 .incbin "base_emerald.gba", 0x3cb640, 0x1fd0
.align 1, 0 .align 1, 0
gMetatileAttributes_BattleFrontier: ; 83CD610 gMetatileAttributes_BattleFrontier: @ 83CD610
.incbin "base_emerald.gba", 0x3cd610, 0x3fa .incbin "base_emerald.gba", 0x3cd610, 0x3fa
.align 1, 0 .align 1, 0
gMetatiles_BattlePalace: ; 83CDA0A gMetatiles_BattlePalace: @ 83CDA0A
.incbin "base_emerald.gba", 0x3cda0a, 0xae0 .incbin "base_emerald.gba", 0x3cda0a, 0xae0
.align 1, 0 .align 1, 0
gMetatileAttributes_BattlePalace: ; 83CE4EA gMetatileAttributes_BattlePalace: @ 83CE4EA
.incbin "base_emerald.gba", 0x3ce4ea, 0x15c .incbin "base_emerald.gba", 0x3ce4ea, 0x15c
.align 1, 0 .align 1, 0
gMetatiles_BattleDome: ; 83CE646 gMetatiles_BattleDome: @ 83CE646
.incbin "base_emerald.gba", 0x3ce646, 0x1ab0 .incbin "base_emerald.gba", 0x3ce646, 0x1ab0
.align 1, 0 .align 1, 0
gMetatileAttributes_BattleDome: ; 83D00F6 gMetatileAttributes_BattleDome: @ 83D00F6
.incbin "base_emerald.gba", 0x3d00f6, 0x356 .incbin "base_emerald.gba", 0x3d00f6, 0x356
.align 1, 0 .align 1, 0
gMetatiles_BattleFactory: ; 83D044C gMetatiles_BattleFactory: @ 83D044C
.incbin "base_emerald.gba", 0x3d044c, 0x1620 .incbin "base_emerald.gba", 0x3d044c, 0x1620
.align 1, 0 .align 1, 0
gMetatileAttributes_BattleFactory: ; 83D1A6C gMetatileAttributes_BattleFactory: @ 83D1A6C
.incbin "base_emerald.gba", 0x3d1a6c, 0x2c4 .incbin "base_emerald.gba", 0x3d1a6c, 0x2c4
.align 1, 0 .align 1, 0
gMetatiles_BattlePike: ; 83D1D30 gMetatiles_BattlePike: @ 83D1D30
.incbin "base_emerald.gba", 0x3d1d30, 0x15b0 .incbin "base_emerald.gba", 0x3d1d30, 0x15b0
.align 1, 0 .align 1, 0
gMetatileAttributes_BattlePike: ; 83D32E0 gMetatileAttributes_BattlePike: @ 83D32E0
.incbin "base_emerald.gba", 0x3d32e0, 0x2b6 .incbin "base_emerald.gba", 0x3d32e0, 0x2b6
.align 1, 0 .align 1, 0
gMetatiles_BattleArena: ; 83D3596 gMetatiles_BattleArena: @ 83D3596
.incbin "base_emerald.gba", 0x3d3596, 0xb10 .incbin "base_emerald.gba", 0x3d3596, 0xb10
.align 1, 0 .align 1, 0
gMetatileAttributes_BattleArena: ; 83D40A6 gMetatileAttributes_BattleArena: @ 83D40A6
.incbin "base_emerald.gba", 0x3d40a6, 0x162 .incbin "base_emerald.gba", 0x3d40a6, 0x162
.align 1, 0 .align 1, 0
gMetatiles_BattlePyramid: ; 83D4208 gMetatiles_BattlePyramid: @ 83D4208
.incbin "base_emerald.gba", 0x3d4208, 0xdd0 .incbin "base_emerald.gba", 0x3d4208, 0xdd0
.align 1, 0 .align 1, 0
gMetatileAttributes_BattlePyramid: ; 83D4FD8 gMetatileAttributes_BattlePyramid: @ 83D4FD8
.incbin "base_emerald.gba", 0x3d4fd8, 0x1ba .incbin "base_emerald.gba", 0x3d4fd8, 0x1ba
.align 1, 0 .align 1, 0
gMetatiles_MirageTower: ; 83D5192 gMetatiles_MirageTower: @ 83D5192
.incbin "base_emerald.gba", 0x3d5192, 0x19e0 .incbin "base_emerald.gba", 0x3d5192, 0x19e0
.align 1, 0 .align 1, 0
gMetatileAttributes_MirageTower: ; 83D6B72 gMetatileAttributes_MirageTower: @ 83D6B72
.incbin "base_emerald.gba", 0x3d6b72, 0x33c .incbin "base_emerald.gba", 0x3d6b72, 0x33c
.align 1, 0 .align 1, 0
gMetatiles_MossdeepGameCorner: ; 83D6EAE gMetatiles_MossdeepGameCorner: @ 83D6EAE
.incbin "base_emerald.gba", 0x3d6eae, 0x350 .incbin "base_emerald.gba", 0x3d6eae, 0x350
.align 1, 0 .align 1, 0
gMetatileAttributes_MossdeepGameCorner: ; 83D71FE gMetatileAttributes_MossdeepGameCorner: @ 83D71FE
.incbin "base_emerald.gba", 0x3d71fe, 0x6a .incbin "base_emerald.gba", 0x3d71fe, 0x6a
.align 1, 0 .align 1, 0
gMetatiles_IslandHarbor: ; 83D7268 gMetatiles_IslandHarbor: @ 83D7268
.incbin "base_emerald.gba", 0x3d7268, 0x1d60 .incbin "base_emerald.gba", 0x3d7268, 0x1d60
.align 1, 0 .align 1, 0
gMetatileAttributes_IslandHarbor: ; 83D8FC8 gMetatileAttributes_IslandHarbor: @ 83D8FC8
.incbin "base_emerald.gba", 0x3d8fc8, 0x3ac .incbin "base_emerald.gba", 0x3d8fc8, 0x3ac
.align 1, 0 .align 1, 0
gMetatiles_TrainerHill: ; 83D9374 gMetatiles_TrainerHill: @ 83D9374
.incbin "base_emerald.gba", 0x3d9374, 0x1e60 .incbin "base_emerald.gba", 0x3d9374, 0x1e60
.align 1, 0 .align 1, 0
gMetatileAttributes_TrainerHill: ; 83DB1D4 gMetatileAttributes_TrainerHill: @ 83DB1D4
.incbin "base_emerald.gba", 0x3db1d4, 0x3cc .incbin "base_emerald.gba", 0x3db1d4, 0x3cc
.align 1, 0 .align 1, 0
gMetatiles_NavelRock: ; 83DB5A0 gMetatiles_NavelRock: @ 83DB5A0
.incbin "base_emerald.gba", 0x3db5a0, 0x1c30 .incbin "base_emerald.gba", 0x3db5a0, 0x1c30
.align 1, 0 .align 1, 0
gMetatileAttributes_NavelRock: ; 83DD1D0 gMetatileAttributes_NavelRock: @ 83DD1D0
.incbin "base_emerald.gba", 0x3dd1d0, 0x386 .incbin "base_emerald.gba", 0x3dd1d0, 0x386
.align 1, 0 .align 1, 0
gMetatiles_BattleFrontierRankingHall: ; 83DD556 gMetatiles_BattleFrontierRankingHall: @ 83DD556
.incbin "base_emerald.gba", 0x3dd556, 0x5e0 .incbin "base_emerald.gba", 0x3dd556, 0x5e0
.align 1, 0 .align 1, 0
gMetatileAttributes_BattleFrontierRankingHall: ; 83DDB36 gMetatileAttributes_BattleFrontierRankingHall: @ 83DDB36
.incbin "base_emerald.gba", 0x3ddb36, 0xbc .incbin "base_emerald.gba", 0x3ddb36, 0xbc
.align 1, 0 .align 1, 0
gMetatiles_BattleTent: ; 83DDBF2 gMetatiles_BattleTent: @ 83DDBF2
.incbin "base_emerald.gba", 0x3ddbf2, 0x10d0 .incbin "base_emerald.gba", 0x3ddbf2, 0x10d0
.align 1, 0 .align 1, 0
gMetatileAttributes_BattleTent: ; 83DECC2 gMetatileAttributes_BattleTent: @ 83DECC2
.incbin "base_emerald.gba", 0x3decc2, 0x21a .incbin "base_emerald.gba", 0x3decc2, 0x21a
.align 1, 0 .align 1, 0
gMetatiles_MysteryEventsHouse: ; 83DEEDC gMetatiles_MysteryEventsHouse: @ 83DEEDC
.incbin "base_emerald.gba", 0x3deedc, 0x430 .incbin "base_emerald.gba", 0x3deedc, 0x430
.align 1, 0 .align 1, 0
gMetatileAttributes_MysteryEventsHouse: ; 83DF30C gMetatileAttributes_MysteryEventsHouse: @ 83DF30C
.incbin "base_emerald.gba", 0x3df30c, 0x86 .incbin "base_emerald.gba", 0x3df30c, 0x86
.align 1, 0 .align 1, 0
gMetatiles_UnionRoom: ; 83DF392 gMetatiles_UnionRoom: @ 83DF392
.incbin "base_emerald.gba", 0x3df392, 0x310 .incbin "base_emerald.gba", 0x3df392, 0x310
.align 1, 0 .align 1, 0
gMetatileAttributes_UnionRoom: ; 83DF6A2 gMetatileAttributes_UnionRoom: @ 83DF6A2
.incbin "base_emerald.gba", 0x3df6a2, 0x62 .incbin "base_emerald.gba", 0x3df6a2, 0x62
data/graphics/tilesets/tileset_graphics.s
+154 -154
View File
File diff suppressed because it is too large Load Diff
data/graphics/tilesets/tilesets.s
+352 -352
View File
File diff suppressed because it is too large Load Diff
data/graphics/trainers/trainer_back_pic_palette_table.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0 .align 2, 0
gTrainerBackPicPaletteTable: ; 8305D8C gTrainerBackPicPaletteTable: @ 8305D8C
obj_pal gTrainerPalette_Brendan, 0 obj_pal gTrainerPalette_Brendan, 0
obj_pal gTrainerPalette_May, 1 obj_pal gTrainerPalette_May, 1
obj_pal gTrainerBackPicPalette_Red, 2 obj_pal gTrainerBackPicPalette_Red, 2
data/graphics/trainers/trainer_back_pic_table.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0 .align 2, 0
gTrainerBackPicTable: ; 8305D4C gTrainerBackPicTable: @ 8305D4C
obj_tiles gTrainerBackPic_Brendan, 0x2000, 0 obj_tiles gTrainerBackPic_Brendan, 0x2000, 0
obj_tiles gTrainerBackPic_May, 0x2000, 1 obj_tiles gTrainerBackPic_May, 0x2000, 1
obj_tiles gTrainerBackPic_Red, 0x2800, 2 obj_tiles gTrainerBackPic_Red, 0x2800, 2
data/graphics/trainers/trainer_front_pic_palette_table.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0 .align 2, 0
gTrainerFrontPicPaletteTable: ; 830593C gTrainerFrontPicPaletteTable: @ 830593C
obj_pal gTrainerPalette_Hiker, 0 obj_pal gTrainerPalette_Hiker, 0
obj_pal gTrainerPalette_AquaGruntM, 1 obj_pal gTrainerPalette_AquaGruntM, 1
obj_pal gTrainerPalette_PokemonBreederF, 2 obj_pal gTrainerPalette_PokemonBreederF, 2
data/graphics/trainers/trainer_front_pic_table.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0 .align 2, 0
gTrainerFrontPicTable: ; 8305654 gTrainerFrontPicTable: @ 8305654
obj_tiles gTrainerFrontPic_Hiker, 0x800, 0 obj_tiles gTrainerFrontPic_Hiker, 0x800, 0
obj_tiles gTrainerFrontPic_AquaGruntM, 0x800, 1 obj_tiles gTrainerFrontPic_AquaGruntM, 0x800, 1
obj_tiles gTrainerFrontPic_PokemonBreederF, 0x800, 2 obj_tiles gTrainerFrontPic_PokemonBreederF, 0x800, 2
data/graphics/trainers/trainer_graphics.s
+196 -196
View File
File diff suppressed because it is too large Load Diff
data/item_effect_info.s
+70 -70
View File
@@ -1,4 +1,4 @@
gPotionItemEffectInfo: ; 831E380 gPotionItemEffectInfo: @ 831E380
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -7,7 +7,7 @@ gPotionItemEffectInfo: ; 831E380
.byte 0x00 .byte 0x00
.byte 20 .byte 20
gAntidoteItemEffectInfo: ; 831E387 gAntidoteItemEffectInfo: @ 831E387
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -15,7 +15,7 @@ gAntidoteItemEffectInfo: ; 831E387
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
gBurnHealItemEffectInfo: ; 831E38D gBurnHealItemEffectInfo: @ 831E38D
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -23,7 +23,7 @@ gBurnHealItemEffectInfo: ; 831E38D
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
gIceHealItemEffectInfo: ; 831E393 gIceHealItemEffectInfo: @ 831E393
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -31,7 +31,7 @@ gIceHealItemEffectInfo: ; 831E393
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
gAwakeningItemEffectInfo: ; 831E399 gAwakeningItemEffectInfo: @ 831E399
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -39,7 +39,7 @@ gAwakeningItemEffectInfo: ; 831E399
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
gParalyzeHealItemEffectInfo: ; 831E39F gParalyzeHealItemEffectInfo: @ 831E39F
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -47,7 +47,7 @@ gParalyzeHealItemEffectInfo: ; 831E39F
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
gFullRestoreItemEffectInfo: ; 831E3A5 gFullRestoreItemEffectInfo: @ 831E3A5
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -56,7 +56,7 @@ gFullRestoreItemEffectInfo: ; 831E3A5
.byte 0x00 .byte 0x00
.byte 0xff .byte 0xff
gMaxPotionItemEffectInfo: ; 831E3AC gMaxPotionItemEffectInfo: @ 831E3AC
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -65,7 +65,7 @@ gMaxPotionItemEffectInfo: ; 831E3AC
.byte 0x00 .byte 0x00
.byte 0xff .byte 0xff
gHyperPotionItemEffectInfo: ; 831E3B3 gHyperPotionItemEffectInfo: @ 831E3B3
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -74,7 +74,7 @@ gHyperPotionItemEffectInfo: ; 831E3B3
.byte 0x00 .byte 0x00
.byte 200 .byte 200
gSuperPotionItemEffectInfo: ; 831E3BA gSuperPotionItemEffectInfo: @ 831E3BA
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -83,7 +83,7 @@ gSuperPotionItemEffectInfo: ; 831E3BA
.byte 0x00 .byte 0x00
.byte 50 .byte 50
gFullHealItemEffectInfo: ; 831E3C1 gFullHealItemEffectInfo: @ 831E3C1
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -91,7 +91,7 @@ gFullHealItemEffectInfo: ; 831E3C1
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
gReviveItemEffectInfo: ; 831E3C7 gReviveItemEffectInfo: @ 831E3C7
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -100,7 +100,7 @@ gReviveItemEffectInfo: ; 831E3C7
.byte 0x00 .byte 0x00
.byte 0xfe .byte 0xfe
gMaxReviveItemEffectInfo: ; 831E3CE gMaxReviveItemEffectInfo: @ 831E3CE
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -109,7 +109,7 @@ gMaxReviveItemEffectInfo: ; 831E3CE
.byte 0x00 .byte 0x00
.byte 0xff .byte 0xff
gFreshWaterItemEffectInfo: ; 831E3D5 gFreshWaterItemEffectInfo: @ 831E3D5
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -118,7 +118,7 @@ gFreshWaterItemEffectInfo: ; 831E3D5
.byte 0x00 .byte 0x00
.byte 50 .byte 50
gSodaPopItemEffectInfo: ; 831E3DC gSodaPopItemEffectInfo: @ 831E3DC
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -127,7 +127,7 @@ gSodaPopItemEffectInfo: ; 831E3DC
.byte 0x00 .byte 0x00
.byte 60 .byte 60
gLemonadeItemEffectInfo: ; 831E3E3 gLemonadeItemEffectInfo: @ 831E3E3
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -136,7 +136,7 @@ gLemonadeItemEffectInfo: ; 831E3E3
.byte 0x00 .byte 0x00
.byte 80 .byte 80
gMoomooMilkItemEffectInfo: ; 831E3EA gMoomooMilkItemEffectInfo: @ 831E3EA
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -145,7 +145,7 @@ gMoomooMilkItemEffectInfo: ; 831E3EA
.byte 0x00 .byte 0x00
.byte 100 .byte 100
gEnergyPowderItemEffectInfo: ; 831E3F1 gEnergyPowderItemEffectInfo: @ 831E3F1
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -157,7 +157,7 @@ gEnergyPowderItemEffectInfo: ; 831E3F1
.byte 0xfb .byte 0xfb
.byte 0xf6 .byte 0xf6
gEnergyRootItemEffectInfo: ; 831E3FB gEnergyRootItemEffectInfo: @ 831E3FB
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -169,7 +169,7 @@ gEnergyRootItemEffectInfo: ; 831E3FB
.byte 0xf6 .byte 0xf6
.byte 0xf1 .byte 0xf1
gHealPowderItemEffectInfo: ; 831E405 gHealPowderItemEffectInfo: @ 831E405
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -180,7 +180,7 @@ gHealPowderItemEffectInfo: ; 831E405
.byte 0xfb .byte 0xfb
.byte 0xf6 .byte 0xf6
gRevivalHerbItemEffectInfo: ; 831E40E gRevivalHerbItemEffectInfo: @ 831E40E
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -192,7 +192,7 @@ gRevivalHerbItemEffectInfo: ; 831E40E
.byte 0xf1 .byte 0xf1
.byte 0xec .byte 0xec
gEtherItemEffectInfo: ; 831E418 gEtherItemEffectInfo: @ 831E418
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -201,7 +201,7 @@ gEtherItemEffectInfo: ; 831E418
.byte 0x00 .byte 0x00
.byte 0x0a .byte 0x0a
gMaxEtherItemEffectInfo: ; 831E41F gMaxEtherItemEffectInfo: @ 831E41F
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -210,7 +210,7 @@ gMaxEtherItemEffectInfo: ; 831E41F
.byte 0x00 .byte 0x00
.byte 0x7f .byte 0x7f
gElixirItemEffectInfo: ; 831E426 gElixirItemEffectInfo: @ 831E426
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -219,7 +219,7 @@ gElixirItemEffectInfo: ; 831E426
.byte 0x00 .byte 0x00
.byte 0x0a .byte 0x0a
gMaxElixirItemEffectInfo: ; 831E42D gMaxElixirItemEffectInfo: @ 831E42D
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -228,7 +228,7 @@ gMaxElixirItemEffectInfo: ; 831E42D
.byte 0x00 .byte 0x00
.byte 0x7f .byte 0x7f
gLavaCookieItemEffectInfo: ; 831E434 gLavaCookieItemEffectInfo: @ 831E434
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -236,7 +236,7 @@ gLavaCookieItemEffectInfo: ; 831E434
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
gBlueFluteItemEffectInfo: ; 831E43A gBlueFluteItemEffectInfo: @ 831E43A
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -244,7 +244,7 @@ gBlueFluteItemEffectInfo: ; 831E43A
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
gYellowFluteItemEffectInfo: ; 831E440 gYellowFluteItemEffectInfo: @ 831E440
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -252,7 +252,7 @@ gYellowFluteItemEffectInfo: ; 831E440
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
gRedFluteItemEffectInfo: ; 831E446 gRedFluteItemEffectInfo: @ 831E446
.byte 0x80 .byte 0x80
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -260,7 +260,7 @@ gRedFluteItemEffectInfo: ; 831E446
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
gBerryJuiceItemEffectInfo: ; 831E44C gBerryJuiceItemEffectInfo: @ 831E44C
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -269,7 +269,7 @@ gBerryJuiceItemEffectInfo: ; 831E44C
.byte 0x00 .byte 0x00
.byte 20 .byte 20
gSacredAshItemEffectInfo: ; 831E453 gSacredAshItemEffectInfo: @ 831E453
.byte 0x40 .byte 0x40
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -278,7 +278,7 @@ gSacredAshItemEffectInfo: ; 831E453
.byte 0x00 .byte 0x00
.byte 0xff .byte 0xff
gHPUpItemEffectInfo: ; 831E45A gHPUpItemEffectInfo: @ 831E45A
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -290,7 +290,7 @@ gHPUpItemEffectInfo: ; 831E45A
.byte 0x03 .byte 0x03
.byte 0x02 .byte 0x02
gProteinItemEffectInfo: ; 831E464 gProteinItemEffectInfo: @ 831E464
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -302,7 +302,7 @@ gProteinItemEffectInfo: ; 831E464
.byte 0x03 .byte 0x03
.byte 0x02 .byte 0x02
gIronItemEffectInfo: ; 831E46E gIronItemEffectInfo: @ 831E46E
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -314,7 +314,7 @@ gIronItemEffectInfo: ; 831E46E
.byte 0x03 .byte 0x03
.byte 0x02 .byte 0x02
gCarbosItemEffectInfo: ; 831E478 gCarbosItemEffectInfo: @ 831E478
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -326,7 +326,7 @@ gCarbosItemEffectInfo: ; 831E478
.byte 0x03 .byte 0x03
.byte 0x02 .byte 0x02
gCalciumItemEffectInfo: ; 831E482 gCalciumItemEffectInfo: @ 831E482
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -338,7 +338,7 @@ gCalciumItemEffectInfo: ; 831E482
.byte 0x03 .byte 0x03
.byte 0x02 .byte 0x02
gRareCandyItemEffectInfo: ; 831E48C gRareCandyItemEffectInfo: @ 831E48C
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -350,7 +350,7 @@ gRareCandyItemEffectInfo: ; 831E48C
.byte 0x03 .byte 0x03
.byte 0x02 .byte 0x02
gPPUpItemEffectInfo: ; 831E496 gPPUpItemEffectInfo: @ 831E496
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -361,7 +361,7 @@ gPPUpItemEffectInfo: ; 831E496
.byte 0x03 .byte 0x03
.byte 0x02 .byte 0x02
gZincItemEffectInfo: ; 831E49F gZincItemEffectInfo: @ 831E49F
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -373,7 +373,7 @@ gZincItemEffectInfo: ; 831E49F
.byte 0x03 .byte 0x03
.byte 0x02 .byte 0x02
gPPMaxItemEffectInfo: ; 831E4A9 gPPMaxItemEffectInfo: @ 831E4A9
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -384,7 +384,7 @@ gPPMaxItemEffectInfo: ; 831E4A9
.byte 0x03 .byte 0x03
.byte 0x02 .byte 0x02
gGuardSpecItemEffectInfo: ; 831E4B2 gGuardSpecItemEffectInfo: @ 831E4B2
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -394,7 +394,7 @@ gGuardSpecItemEffectInfo: ; 831E4B2
.byte 0x01 .byte 0x01
.byte 0x01 .byte 0x01
gDireHitItemEffectInfo: ; 831E4BA gDireHitItemEffectInfo: @ 831E4BA
.byte 0x20 .byte 0x20
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -404,7 +404,7 @@ gDireHitItemEffectInfo: ; 831E4BA
.byte 0x01 .byte 0x01
.byte 0x01 .byte 0x01
gXAttackItemEffectInfo: ; 831E4C2 gXAttackItemEffectInfo: @ 831E4C2
.byte 0x01 .byte 0x01
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -414,7 +414,7 @@ gXAttackItemEffectInfo: ; 831E4C2
.byte 0x01 .byte 0x01
.byte 0x01 .byte 0x01
gXDefendItemEffectInfo: ; 831E4CA gXDefendItemEffectInfo: @ 831E4CA
.byte 0x00 .byte 0x00
.byte 0x10 .byte 0x10
.byte 0x00 .byte 0x00
@@ -424,7 +424,7 @@ gXDefendItemEffectInfo: ; 831E4CA
.byte 0x01 .byte 0x01
.byte 0x01 .byte 0x01
gXSpeedItemEffectInfo: ; 831E4D2 gXSpeedItemEffectInfo: @ 831E4D2
.byte 0x00 .byte 0x00
.byte 0x01 .byte 0x01
.byte 0x00 .byte 0x00
@@ -434,7 +434,7 @@ gXSpeedItemEffectInfo: ; 831E4D2
.byte 0x01 .byte 0x01
.byte 0x01 .byte 0x01
gXAccuracyItemEffectInfo: ; 831E4DA gXAccuracyItemEffectInfo: @ 831E4DA
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x10 .byte 0x10
@@ -444,7 +444,7 @@ gXAccuracyItemEffectInfo: ; 831E4DA
.byte 0x01 .byte 0x01
.byte 0x01 .byte 0x01
gXSpecialItemEffectInfo: ; 831E4E2 gXSpecialItemEffectInfo: @ 831E4E2
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x01 .byte 0x01
@@ -454,7 +454,7 @@ gXSpecialItemEffectInfo: ; 831E4E2
.byte 0x01 .byte 0x01
.byte 0x01 .byte 0x01
gSunStoneItemEffectInfo: ; 831E4EA gSunStoneItemEffectInfo: @ 831E4EA
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -462,7 +462,7 @@ gSunStoneItemEffectInfo: ; 831E4EA
.byte 0x80 .byte 0x80
.byte 0x00 .byte 0x00
gMoonStoneItemEffectInfo: ; 831E4F0 gMoonStoneItemEffectInfo: @ 831E4F0
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -470,7 +470,7 @@ gMoonStoneItemEffectInfo: ; 831E4F0
.byte 0x80 .byte 0x80
.byte 0x00 .byte 0x00
gFireStoneItemEffectInfo: ; 831E4F6 gFireStoneItemEffectInfo: @ 831E4F6
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -478,7 +478,7 @@ gFireStoneItemEffectInfo: ; 831E4F6
.byte 0x80 .byte 0x80
.byte 0x00 .byte 0x00
gThunderStoneItemEffectInfo: ; 831E4FC gThunderStoneItemEffectInfo: @ 831E4FC
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -486,7 +486,7 @@ gThunderStoneItemEffectInfo: ; 831E4FC
.byte 0x80 .byte 0x80
.byte 0x00 .byte 0x00
gWaterStoneItemEffectInfo: ; 831E502 gWaterStoneItemEffectInfo: @ 831E502
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -494,7 +494,7 @@ gWaterStoneItemEffectInfo: ; 831E502
.byte 0x80 .byte 0x80
.byte 0x00 .byte 0x00
gLeafStoneItemEffectInfo: ; 831E508 gLeafStoneItemEffectInfo: @ 831E508
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -502,7 +502,7 @@ gLeafStoneItemEffectInfo: ; 831E508
.byte 0x80 .byte 0x80
.byte 0x00 .byte 0x00
gCheriBerryItemEffectInfo: ; 831E50E gCheriBerryItemEffectInfo: @ 831E50E
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -510,7 +510,7 @@ gCheriBerryItemEffectInfo: ; 831E50E
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
gChestoBerryItemEffectInfo: ; 831E514 gChestoBerryItemEffectInfo: @ 831E514
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -518,7 +518,7 @@ gChestoBerryItemEffectInfo: ; 831E514
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
gPechaBerryItemEffectInfo: ; 831E51A gPechaBerryItemEffectInfo: @ 831E51A
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -526,7 +526,7 @@ gPechaBerryItemEffectInfo: ; 831E51A
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
gRawstBerryItemEffectInfo: ; 831E520 gRawstBerryItemEffectInfo: @ 831E520
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -534,7 +534,7 @@ gRawstBerryItemEffectInfo: ; 831E520
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
gAspearBerryItemEffectInfo: ; 831E526 gAspearBerryItemEffectInfo: @ 831E526
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -542,7 +542,7 @@ gAspearBerryItemEffectInfo: ; 831E526
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
gLeppaBerryItemEffectInfo: ; 831E52C gLeppaBerryItemEffectInfo: @ 831E52C
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -551,7 +551,7 @@ gLeppaBerryItemEffectInfo: ; 831E52C
.byte 0x00 .byte 0x00
.byte 0x0a .byte 0x0a
gOranBerryItemEffectInfo: ; 831E533 gOranBerryItemEffectInfo: @ 831E533
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -560,7 +560,7 @@ gOranBerryItemEffectInfo: ; 831E533
.byte 0x00 .byte 0x00
.byte 10 .byte 10
gPersimBerryItemEffectInfo: ; 831E53A gPersimBerryItemEffectInfo: @ 831E53A
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -568,7 +568,7 @@ gPersimBerryItemEffectInfo: ; 831E53A
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
gLumBerryItemEffectInfo: ; 831E540 gLumBerryItemEffectInfo: @ 831E540
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -576,7 +576,7 @@ gLumBerryItemEffectInfo: ; 831E540
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
gSitrusBerryItemEffectInfo: ; 831E546 gSitrusBerryItemEffectInfo: @ 831E546
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -585,7 +585,7 @@ gSitrusBerryItemEffectInfo: ; 831E546
.byte 0x00 .byte 0x00
.byte 30 .byte 30
gPomegBerryItemEffectInfo: ; 831E54D gPomegBerryItemEffectInfo: @ 831E54D
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -597,7 +597,7 @@ gPomegBerryItemEffectInfo: ; 831E54D
.byte 0x05 .byte 0x05
.byte 0x02 .byte 0x02
gKelpsyBerryItemEffectInfo: ; 831E557 gKelpsyBerryItemEffectInfo: @ 831E557
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -609,7 +609,7 @@ gKelpsyBerryItemEffectInfo: ; 831E557
.byte 0x05 .byte 0x05
.byte 0x02 .byte 0x02
gQualotBerryItemEffectInfo: ; 831E561 gQualotBerryItemEffectInfo: @ 831E561
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -621,7 +621,7 @@ gQualotBerryItemEffectInfo: ; 831E561
.byte 0x05 .byte 0x05
.byte 0x02 .byte 0x02
gHondewBerryItemEffectInfo: ; 831E56B gHondewBerryItemEffectInfo: @ 831E56B
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -633,7 +633,7 @@ gHondewBerryItemEffectInfo: ; 831E56B
.byte 0x05 .byte 0x05
.byte 0x02 .byte 0x02
gGrepaBerryItemEffectInfo: ; 831E575 gGrepaBerryItemEffectInfo: @ 831E575
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -645,7 +645,7 @@ gGrepaBerryItemEffectInfo: ; 831E575
.byte 0x05 .byte 0x05
.byte 0x02 .byte 0x02
gTamatoBerryItemEffectInfo: ; 831E57F gTamatoBerryItemEffectInfo: @ 831E57F
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@@ -659,7 +659,7 @@ gTamatoBerryItemEffectInfo: ; 831E57F
.align 2, 0 .align 2, 0
gItemEffectInfoPointers: ; 831E58C gItemEffectInfoPointers: @ 831E58C
.4byte gPotionItemEffectInfo .4byte gPotionItemEffectInfo
.4byte gAntidoteItemEffectInfo .4byte gAntidoteItemEffectInfo
.4byte gBurnHealItemEffectInfo .4byte gBurnHealItemEffectInfo
data/items.s
+378 -378
View File
File diff suppressed because it is too large Load Diff
data/level_up_learnset_pointers.s
+1 -1
View File
@@ -1,6 +1,6 @@
.align 2, 0 .align 2, 0
gLevelUpLearnsetPointers: ; 832937C gLevelUpLearnsetPointers: @ 832937C
.4byte gBulbasaurLevelUpLearnset .4byte gBulbasaurLevelUpLearnset
.4byte gBulbasaurLevelUpLearnset .4byte gBulbasaurLevelUpLearnset
.4byte gIvysaurLevelUpLearnset .4byte gIvysaurLevelUpLearnset

Some files were not shown because too many files have changed in this diff Show More