pret/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-10-02 23:45:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into name_labels

Browse Source
This commit is contained in:
Marcus Huderle
2017-09-30 16:41:16 -07:00
parent aaa09d7354 f74d4742f5
commit 4c5bfdc153
339 changed files with 33991 additions and 60978 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+17 -1
View File
@@ -9,8 +9,24 @@ It builds the following roms:
To set up the repository, see [INSTALL.md](INSTALL.md).
### irc: [freenode#pret][irc]
## See also
* Disassembly of [**Pokémon Red/Blue**][pokered]
* Disassembly of [**Pokémon Yellow**][pokeyellow]
* Disassembly of [**Pokémon Crystal**][pokecrystal]
* Disassembly of [**Pokémon Pinball**][pokepinball]
* Disassembly of [**Pokémon TCG**][poketcg]
* Disassembly of [**Pokémon Emerald**][pokeemerald]
* Discord: [**pret**][Discord]
* irc: **irc.freenode.net** [**#pret**][irc]
[pokered]: https://github.com/pret/pokered
[pokeyellow]: https://github.com/pret/pokeyellow
[pokecrystal]: https://github.com/pret/pokecrystal
[pokepinball]: https://github.com/pret/pokepinball
[poketcg]: https://github.com/pret/poketcg
[pokeemerald]: https://github.com/pret/pokeemerald
[Discord]: https://discord.gg/cJxDDVP
[irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret
[travis]: https://travis-ci.org/pret/pokeruby
[travis-badge]: https://travis-ci.org/pret/pokeruby.svg?branch=master
asm/battle_2.s
+6 -6
View File
@@ -189,7 +189,7 @@ _080124A8:
lsls r0, 8
orrs r2, r0
movs r0, 0
bl dp01_build_cmdbuf_x12_a_bb
bl Emitcmd18
bl _08012E32
.align 2, 0
_080124C0: .4byte gActionForBanks
@@ -408,7 +408,7 @@ _0801264E:
movs r0, 0
movs r2, 0
add r3, sp, 0x4
bl sub_800CBA4
bl Emitcmd20
b _0801289E
.align 2, 0
_080126AC: .4byte gBattleMons
@@ -698,7 +698,7 @@ _08012908:
ldr r0, _08012928 @ =0x0201606c
adds r1, r0
movs r0, 0
bl sub_800CBE0
bl EmitOpenBag
ldrb r0, [r4]
bl MarkBufferBankForExecution
b _08012968
@@ -725,7 +725,7 @@ _0801292C:
adds r0, r4
strb r5, [r0]
movs r0, 0
bl dp01_build_cmdbuf_x32_32_32_32
bl Emitcmd50
mov r4, r8
ldrb r0, [r4]
bl MarkBufferBankForExecution
@@ -3144,7 +3144,7 @@ _08013D4C:
ldr r1, _08013D6C @ =gBattleMainFunc
ldr r0, _08013D70 @ =sub_8013DA8
str r0, [r1]
ldr r1, _08013D74 @ =gUnknown_03005E94
ldr r1, _08013D74 @ =gCB2_AfterEvolution
ldr r0, _08013D78 @ =sub_800F808
str r0, [r1]
b _08013D96
@@ -3152,7 +3152,7 @@ _08013D4C:
_08013D68: .4byte gNoOfAllBanks
_08013D6C: .4byte gBattleMainFunc
_08013D70: .4byte sub_8013DA8
_08013D74: .4byte gUnknown_03005E94
_08013D74: .4byte gCB2_AfterEvolution
_08013D78: .4byte sub_800F808
_08013D7C:
ldr r0, _08013D9C @ =gBattleExecBuffer
asm/battle_5.s
-4591
View File
File diff suppressed because it is too large Load Diff
asm/battle_9.s
+7 -1417
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_81258BC.s
+2 -1394
View File
File diff suppressed because it is too large Load Diff
asm/battle_tower.s
+5 -5
View File
@@ -2082,7 +2082,7 @@ sub_8135534: @ 8135534
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_811AAE8
bl IsBattleTransitionDone
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2163,10 +2163,10 @@ _081355D6:
bl CreateTask
movs r0, 0
bl current_map_music_set__default_for_battle
bl GetBattleTowerBattleTransition
bl BattleSetup_GetBattleTowerBattleTransition
lsls r0, 24
lsrs r0, 24
bl sub_811AABC
bl BattleTransition_StartOnField
b _08135648
.align 2, 0
_081355F4: .4byte gPlayerParty
@@ -2200,10 +2200,10 @@ _08135606:
bl CreateTask
movs r0, 0
bl current_map_music_set__default_for_battle
bl GetBattleTowerBattleTransition
bl BattleSetup_GetBattleTowerBattleTransition
lsls r0, 24
lsrs r0, 24
bl sub_811AABC
bl BattleTransition_StartOnField
_08135648:
add sp, 0x4
pop {r4,r5}
asm/battle_transition.s
-6254
View File
File diff suppressed because it is too large Load Diff
asm/cable_club.s
-1671
View File
File diff suppressed because it is too large Load Diff
asm/cute_sketch.s
-439
View File
@@ -6,445 +6,6 @@
.text
thumb_func_start sub_80FC7A0
sub_80FC7A0: @ 80FC7A0
push {lr}
ldr r2, _080FC7E8 @ =gUnknown_03005DEC
ldr r1, [r0, 0x4]
str r1, [r2]
ldr r2, _080FC7EC @ =gUnknown_03005E00
ldrb r1, [r0, 0x1F]
strb r1, [r2]
ldr r2, _080FC7F0 @ =gUnknown_03005DE8
ldrb r1, [r0, 0x19]
strb r1, [r2]
ldr r2, _080FC7F4 @ =gUnknown_03005DFC
ldrb r1, [r0, 0x1A]
strb r1, [r2]
ldr r2, _080FC7F8 @ =gUnknown_03005DF8
ldrb r1, [r0, 0x1B]
strb r1, [r2]
ldr r2, _080FC7FC @ =gUnknown_03005DF0
ldrb r1, [r0, 0x1C]
strb r1, [r2]
ldr r2, _080FC800 @ =gUnknown_03005E04
ldrb r1, [r0, 0x1D]
strb r1, [r2]
ldr r2, _080FC804 @ =gUnknown_03005DF4
ldrb r1, [r0, 0x1E]
strb r1, [r2]
ldrb r0, [r0]
subs r0, 0x2
cmp r0, 0x22
bls _080FC7DC
b _080FC928
_080FC7DC:
lsls r0, 2
ldr r1, _080FC808 @ =_080FC80C
adds r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080FC7E8: .4byte gUnknown_03005DEC
_080FC7EC: .4byte gUnknown_03005E00
_080FC7F0: .4byte gUnknown_03005DE8
_080FC7F4: .4byte gUnknown_03005DFC
_080FC7F8: .4byte gUnknown_03005DF8
_080FC7FC: .4byte gUnknown_03005DF0
_080FC800: .4byte gUnknown_03005E04
_080FC804: .4byte gUnknown_03005DF4
_080FC808: .4byte _080FC80C
.align 2, 0
_080FC80C:
.4byte _080FC898
.4byte _080FC928
.4byte _080FC928
.4byte _080FC928
.4byte _080FC8F8
.4byte _080FC928
.4byte _080FC89E
.4byte _080FC8A4
.4byte _080FC8B8
.4byte _080FC8CA
.4byte _080FC928
.4byte _080FC8E0
.4byte _080FC928
.4byte _080FC928
.4byte _080FC928
.4byte _080FC928
.4byte _080FC928
.4byte _080FC928
.4byte _080FC928
.4byte _080FC928
.4byte _080FC928
.4byte _080FC928
.4byte _080FC928
.4byte _080FC928
.4byte _080FC928
.4byte _080FC928
.4byte _080FC928
.4byte _080FC928
.4byte _080FC8E6
.4byte _080FC8C4
.4byte _080FC8EC
.4byte _080FC8F2
.4byte _080FC928
.4byte _080FC928
.4byte _080FC904
_080FC898:
bl sub_80FCAA4
b _080FC928
_080FC89E:
bl sub_80FCB5C
b _080FC928
_080FC8A4:
bl sub_80FCD54
ldr r0, _080FC8B4 @ =gUnknown_03005E00
ldrb r0, [r0]
bl sub_80FCC18
b _080FC928
.align 2, 0
_080FC8B4: .4byte gUnknown_03005E00
_080FC8B8:
bl sub_80FCD54
bl sub_80FCEA4
bl sub_80FCCBC
_080FC8C4:
bl sub_80FCEA4
b _080FC928
_080FC8CA:
bl sub_80FCD54
bl sub_80FD06C
bl sub_80FD06C
bl sub_80FD114
bl sub_80FCCBC
b _080FC928
_080FC8E0:
bl sub_80FCF3C
b _080FC928
_080FC8E6:
bl sub_80FCD54
b _080FC928
_080FC8EC:
bl sub_80FD06C
b _080FC928
_080FC8F2:
bl sub_80FD114
b _080FC928
_080FC8F8:
bl sub_80FCAC4
movs r0, 0x3
bl sub_80FC92C
b _080FC928
_080FC904:
bl sub_80FCD54
bl sub_80FD06C
bl sub_80FD114
bl sub_80FCCBC
bl sub_80FCB5C
bl sub_80FCB5C
movs r0, 0x2
bl sub_80FC92C
movs r0, 0x4
bl sub_80FC9E4
_080FC928:
pop {r0}
bx r0
thumb_func_end sub_80FC7A0
thumb_func_start sub_80FC92C
sub_80FC92C: @ 80FC92C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
lsls r0, 24
lsrs r7, r0, 24
movs r2, 0
ldr r0, _080FC9CC @ =gUnknown_03005DF0
mov r8, r0
ldrb r0, [r0]
cmp r2, r0
bcs _080FC9BE
ldr r1, _080FC9D0 @ =gUnknown_03005DF8
mov r12, r1
ldr r3, _080FC9D4 @ =gUnknown_03005E04
mov r10, r3
ldr r0, _080FC9D8 @ =gUnknown_03005DE8
mov r9, r0
_080FC952:
ldr r1, _080FC9DC @ =gUnknown_03005DFC
ldrb r0, [r1]
adds r0, r2
mov r3, r10
ldrb r1, [r3]
muls r0, r1
lsls r0, 1
ldr r3, _080FC9E0 @ =gUnknown_03005DEC
ldr r1, [r3]
adds r1, r0
mov r3, r9
ldrb r0, [r3]
lsls r0, 1
adds r3, r1, r0
movs r4, 0
adds r5, r2, 0x1
mov r0, r12
ldrb r0, [r0]
cmp r4, r0
bcs _080FC9B2
movs r6, 0x80
lsls r6, 8
_080FC97E:
ldrh r1, [r3]
adds r0, r6, 0
ands r0, r1
cmp r0, 0
bne _080FC9A2
movs r0, 0x1F
ands r0, r1
adds r0, r7
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x1F
bls _080FC998
movs r2, 0x1F
_080FC998:
lsls r0, r2, 10
lsls r1, r2, 5
orrs r0, r1
orrs r0, r2
strh r0, [r3]
_080FC9A2:
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
adds r3, 0x2
mov r1, r12
ldrb r1, [r1]
cmp r4, r1
bcc _080FC97E
_080FC9B2:
lsls r0, r5, 24
lsrs r2, r0, 24
mov r3, r8
ldrb r3, [r3]
cmp r2, r3
bcc _080FC952
_080FC9BE:
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_080FC9CC: .4byte gUnknown_03005DF0
_080FC9D0: .4byte gUnknown_03005DF8
_080FC9D4: .4byte gUnknown_03005E04
_080FC9D8: .4byte gUnknown_03005DE8
_080FC9DC: .4byte gUnknown_03005DFC
_080FC9E0: .4byte gUnknown_03005DEC
thumb_func_end sub_80FC92C
thumb_func_start sub_80FC9E4
sub_80FC9E4: @ 80FC9E4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
lsls r0, 24
lsrs r0, 24
mov r8, r0
movs r2, 0
ldr r0, _080FCA8C @ =gUnknown_03005DF0
ldrb r0, [r0]
cmp r2, r0
bcs _080FCA7C
ldr r1, _080FCA90 @ =gUnknown_03005DF8
mov r10, r1
_080FCA02:
ldr r3, _080FCA94 @ =gUnknown_03005DFC
ldrb r0, [r3]
adds r0, r2
ldr r3, _080FCA98 @ =gUnknown_03005E04
ldrb r1, [r3]
muls r0, r1
lsls r0, 1
ldr r3, _080FCA9C @ =gUnknown_03005DEC
ldr r1, [r3]
adds r1, r0
ldr r3, _080FCAA0 @ =gUnknown_03005DE8
ldrb r0, [r3]
lsls r0, 1
adds r3, r1, r0
movs r5, 0
adds r7, r2, 0x1
mov r0, r10
ldrb r0, [r0]
cmp r5, r0
bcs _080FCA70
movs r1, 0x80
lsls r1, 8
mov r9, r1
movs r0, 0x1F
mov r12, r0
mov r1, r8
subs r6, r0, r1
_080FCA38:
ldrh r1, [r3]
mov r0, r9
ands r0, r1
cmp r0, 0
bne _080FCA60
movs r4, 0x1F
mov r2, r12
ands r2, r1
cmp r2, r6
ble _080FCA56
mov r1, r8
lsrs r0, r1, 1
subs r0, r4, r0
lsls r0, 24
lsrs r2, r0, 24
_080FCA56:
lsls r0, r2, 10
lsls r1, r2, 5
orrs r0, r1
orrs r0, r2
strh r0, [r3]
_080FCA60:
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
adds r3, 0x2
mov r0, r10
ldrb r0, [r0]
cmp r5, r0
bcc _080FCA38
_080FCA70:
lsls r0, r7, 24
lsrs r2, r0, 24
ldr r1, _080FCA8C @ =gUnknown_03005DF0
ldrb r1, [r1]
cmp r2, r1
bcc _080FCA02
_080FCA7C:
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_080FCA8C: .4byte gUnknown_03005DF0
_080FCA90: .4byte gUnknown_03005DF8
_080FCA94: .4byte gUnknown_03005DFC
_080FCA98: .4byte gUnknown_03005E04
_080FCA9C: .4byte gUnknown_03005DEC
_080FCAA0: .4byte gUnknown_03005DE8
thumb_func_end sub_80FC9E4
thumb_func_start sub_80FCAA4
sub_80FCAA4: @ 80FCAA4
push {r4,r5,lr}
movs r4, 0
ldr r5, _080FCAC0 @ =0x00000c7f
_080FCAAA:
lsls r0, r4, 16
lsrs r0, 16
bl sub_80FD1C8
adds r4, 0x1
cmp r4, r5
bls _080FCAAA
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080FCAC0: .4byte 0x00000c7f
thumb_func_end sub_80FCAA4
thumb_func_start sub_80FCAC4
sub_80FCAC4: @ 80FCAC4
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x4
movs r2, 0
ldr r0, _080FCB44 @ =gUnknown_03005DF0
ldrb r0, [r0]
cmp r2, r0
bcs _080FCB36
ldr r0, _080FCB48 @ =gUnknown_03005DEC
mov r8, r0
ldr r3, _080FCB4C @ =gUnknown_03005DF8
_080FCADC:
ldr r0, _080FCB50 @ =gUnknown_03005DFC
ldrb r1, [r0]
adds r1, r2
ldr r0, _080FCB54 @ =gUnknown_03005E04
ldrb r0, [r0]
muls r0, r1
lsls r0, 1
mov r4, r8
ldr r1, [r4]
adds r1, r0
ldr r0, _080FCB58 @ =gUnknown_03005DE8
ldrb r0, [r0]
lsls r0, 1
adds r4, r1, r0
movs r5, 0
adds r6, r2, 0x1
ldrb r0, [r3]
cmp r5, r0
bcs _080FCB2A
movs r0, 0x80
lsls r0, 8
adds r7, r0, 0
_080FCB08:
ldrh r0, [r4]
ands r0, r7
cmp r0, 0
bne _080FCB1C
adds r0, r4, 0
str r3, [sp]
bl sub_80FD39C
strh r0, [r4]
ldr r3, [sp]
_080FCB1C:
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
adds r4, 0x2
ldrb r0, [r3]
cmp r5, r0
bcc _080FCB08
_080FCB2A:
lsls r0, r6, 24
lsrs r2, r0, 24
ldr r0, _080FCB44 @ =gUnknown_03005DF0
ldrb r0, [r0]
cmp r2, r0
bcc _080FCADC
_080FCB36:
add sp, 0x4
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_080FCB44: .4byte gUnknown_03005DF0
_080FCB48: .4byte gUnknown_03005DEC
_080FCB4C: .4byte gUnknown_03005DF8
_080FCB50: .4byte gUnknown_03005DFC
_080FCB54: .4byte gUnknown_03005E04
_080FCB58: .4byte gUnknown_03005DE8
thumb_func_end sub_80FCAC4
thumb_func_start sub_80FCB5C
sub_80FCB5C: @ 80FCB5C
asm/daycare.s
-2399
View File
File diff suppressed because it is too large Load Diff
asm/evolution_graphics.s
-1829
View File
File diff suppressed because it is too large Load Diff
asm/evolution_scene.s
-6717
View File
File diff suppressed because it is too large Load Diff
asm/field_effect_helpers.s
-4349
View File
File diff suppressed because it is too large Load Diff
asm/field_ground_effect.s
-1302
View File
File diff suppressed because it is too large Load Diff
asm/field_map_obj.s
-628
View File
@@ -1,628 +0,0 @@
.include "constants/gba_constants.inc"
.include "constants/species_constants.inc"
.include "asm/macros.inc"
.syntax unified
.text
.ifndef NONMATCHING
thumb_func_start sub_805F3EC
sub_805F3EC: @ 805F3EC
movs r0, 0
bx lr
thumb_func_end sub_805F3EC
thumb_func_start sub_805F3F0
sub_805F3F0: @ 805F3F0
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
lsls r2, 24
lsrs r2, 24
ldr r1, _0805F434 @ =gUnknown_0836DC09
ldrb r0, [r4, 0x6]
adds r0, r1
ldrb r0, [r0]
adds r1, r4, 0
adds r1, 0x21
ldrb r1, [r1]
bl state_to_direction
bl GetFaceDirectionAnimId
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r5, 0
bl FieldObjectSetRegularAnim
ldrb r0, [r4]
movs r1, 0x2
orrs r0, r1
strb r0, [r4]
movs r0, 0x2
strh r0, [r5, 0x30]
movs r0, 0x1
pop {r4,r5}
pop {r1}
bx r1
.align 2, 0
_0805F434: .4byte gUnknown_0836DC09
thumb_func_end sub_805F3F0
thumb_func_start sub_805F438
sub_805F438: @ 805F438
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x4
adds r4, r0, 0
adds r7, r1, 0
mov r8, r3
lsls r2, 24
lsrs r6, r2, 24
ldr r1, _0805F4EC @ =gUnknown_0836DC09
ldrb r0, [r4, 0x6]
adds r0, r1
ldrb r0, [r0]
adds r1, r4, 0
adds r1, 0x21
ldrb r1, [r1]
adds r2, r6, 0
bl state_to_direction
adds r6, r0, 0
mov r5, sp
adds r5, 0x2
adds r0, r4, 0
adds r1, r6, 0
mov r2, sp
adds r3, r5, 0
bl FieldObjectMoveDestCoords
adds r0, r6, 0
bl GetGoSpeed0AnimId
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r7, 0
bl FieldObjectSetRegularAnim
mov r0, sp
movs r2, 0
ldrsh r1, [r0, r2]
movs r0, 0
ldrsh r2, [r5, r0]
adds r0, r4, 0
adds r3, r6, 0
bl npc_block_way
lsls r0, 24
cmp r0, 0
bne _0805F4BE
mov r1, r8
cmp r1, 0
beq _0805F4D2
mov r0, sp
movs r2, 0
ldrsh r0, [r0, r2]
movs r2, 0
ldrsh r1, [r5, r2]
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl _call_via_r8
lsls r0, 24
cmp r0, 0
bne _0805F4D2
_0805F4BE:
adds r0, r6, 0
bl GetFaceDirectionAnimId
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r7, 0
bl FieldObjectSetRegularAnim
_0805F4D2:
ldrb r0, [r4]
movs r1, 0x2
orrs r0, r1
strb r0, [r4]
movs r0, 0x2
strh r0, [r7, 0x30]
movs r0, 0x1
add sp, 0x4
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
.align 2, 0
_0805F4EC: .4byte gUnknown_0836DC09
thumb_func_end sub_805F438
.endif
thumb_func_start sub_805F4F0
sub_805F4F0: @ 805F4F0
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x4
adds r4, r0, 0
adds r7, r1, 0
mov r8, r3
lsls r2, 24
lsrs r6, r2, 24
ldr r1, _0805F5A4 @ =gUnknown_0836DC09
ldrb r0, [r4, 0x6]
adds r0, r1
ldrb r0, [r0]
adds r1, r4, 0
adds r1, 0x21
ldrb r1, [r1]
adds r2, r6, 0
bl state_to_direction
adds r6, r0, 0
mov r5, sp
adds r5, 0x2
adds r0, r4, 0
adds r1, r6, 0
mov r2, sp
adds r3, r5, 0
bl FieldObjectMoveDestCoords
adds r0, r6, 0
bl sub_8060744
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r7, 0
bl FieldObjectSetRegularAnim
mov r0, sp
movs r2, 0
ldrsh r1, [r0, r2]
movs r0, 0
ldrsh r2, [r5, r0]
adds r0, r4, 0
adds r3, r6, 0
bl npc_block_way
lsls r0, 24
cmp r0, 0
bne _0805F576
mov r1, r8
cmp r1, 0
beq _0805F58A
mov r0, sp
movs r2, 0
ldrsh r0, [r0, r2]
movs r2, 0
ldrsh r1, [r5, r2]
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl _call_via_r8
lsls r0, 24
cmp r0, 0
bne _0805F58A
_0805F576:
adds r0, r6, 0
bl GetFaceDirectionAnimId
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r7, 0
bl FieldObjectSetRegularAnim
_0805F58A:
ldrb r0, [r4]
movs r1, 0x2
orrs r0, r1
strb r0, [r4]
movs r0, 0x2
strh r0, [r7, 0x30]
movs r0, 0x1
add sp, 0x4
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
.align 2, 0
_0805F5A4: .4byte gUnknown_0836DC09
thumb_func_end sub_805F4F0
thumb_func_start sub_805F5A8
sub_805F5A8: @ 805F5A8
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x4
adds r4, r0, 0
adds r7, r1, 0
mov r8, r3
lsls r2, 24
lsrs r6, r2, 24
ldr r1, _0805F65C @ =gUnknown_0836DC09
ldrb r0, [r4, 0x6]
adds r0, r1
ldrb r0, [r0]
adds r1, r4, 0
adds r1, 0x21
ldrb r1, [r1]
adds r2, r6, 0
bl state_to_direction
adds r6, r0, 0
mov r5, sp
adds r5, 0x2
adds r0, r4, 0
adds r1, r6, 0
mov r2, sp
adds r3, r5, 0
bl FieldObjectMoveDestCoords
adds r0, r6, 0
bl sub_806079C
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r7, 0
bl FieldObjectSetRegularAnim
mov r0, sp
movs r2, 0
ldrsh r1, [r0, r2]
movs r0, 0
ldrsh r2, [r5, r0]
adds r0, r4, 0
adds r3, r6, 0
bl npc_block_way
lsls r0, 24
cmp r0, 0
bne _0805F62E
mov r1, r8
cmp r1, 0
beq _0805F642
mov r0, sp
movs r2, 0
ldrsh r0, [r0, r2]
movs r2, 0
ldrsh r1, [r5, r2]
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl _call_via_r8
lsls r0, 24
cmp r0, 0
bne _0805F642
_0805F62E:
adds r0, r6, 0
bl GetFaceDirectionAnimId
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r7, 0
bl FieldObjectSetRegularAnim
_0805F642:
ldrb r0, [r4]
movs r1, 0x2
orrs r0, r1
strb r0, [r4]
movs r0, 0x2
strh r0, [r7, 0x30]
movs r0, 0x1
add sp, 0x4
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
.align 2, 0
_0805F65C: .4byte gUnknown_0836DC09
thumb_func_end sub_805F5A8
thumb_func_start sub_805F660
sub_805F660: @ 805F660
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x4
adds r4, r0, 0
adds r7, r1, 0
mov r8, r3
lsls r2, 24
lsrs r6, r2, 24
ldr r1, _0805F714 @ =gUnknown_0836DC09
ldrb r0, [r4, 0x6]
adds r0, r1
ldrb r0, [r0]
adds r1, r4, 0
adds r1, 0x21
ldrb r1, [r1]
adds r2, r6, 0
bl state_to_direction
adds r6, r0, 0
mov r5, sp
adds r5, 0x2
adds r0, r4, 0
adds r1, r6, 0
mov r2, sp
adds r3, r5, 0
bl FieldObjectMoveDestCoords
adds r0, r6, 0
bl sub_80607C8
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r7, 0
bl FieldObjectSetRegularAnim
mov r0, sp
movs r2, 0
ldrsh r1, [r0, r2]
movs r0, 0
ldrsh r2, [r5, r0]
adds r0, r4, 0
adds r3, r6, 0
bl npc_block_way
lsls r0, 24
cmp r0, 0
bne _0805F6E6
mov r1, r8
cmp r1, 0
beq _0805F6FA
mov r0, sp
movs r2, 0
ldrsh r0, [r0, r2]
movs r2, 0
ldrsh r1, [r5, r2]
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl _call_via_r8
lsls r0, 24
cmp r0, 0
bne _0805F6FA
_0805F6E6:
adds r0, r6, 0
bl GetFaceDirectionAnimId
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r7, 0
bl FieldObjectSetRegularAnim
_0805F6FA:
ldrb r0, [r4]
movs r1, 0x2
orrs r0, r1
strb r0, [r4]
movs r0, 0x2
strh r0, [r7, 0x30]
movs r0, 0x1
add sp, 0x4
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
.align 2, 0
_0805F714: .4byte gUnknown_0836DC09
thumb_func_end sub_805F660
thumb_func_start cph_IM_DIFFERENT
cph_IM_DIFFERENT: @ 805F718
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
lsls r2, 24
lsrs r2, 24
ldr r1, _0805F75C @ =gUnknown_0836DC09
ldrb r0, [r4, 0x6]
adds r0, r1
ldrb r0, [r0]
adds r1, r4, 0
adds r1, 0x21
ldrb r1, [r1]
bl state_to_direction
bl sub_806084C
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r5, 0
bl FieldObjectSetRegularAnim
ldrb r0, [r4]
movs r1, 0x2
orrs r0, r1
strb r0, [r4]
movs r0, 0x2
strh r0, [r5, 0x30]
movs r0, 0x1
pop {r4,r5}
pop {r1}
bx r1
.align 2, 0
_0805F75C: .4byte gUnknown_0836DC09
thumb_func_end cph_IM_DIFFERENT
thumb_func_start sub_805F760
sub_805F760: @ 805F760
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x4
adds r4, r0, 0
adds r7, r1, 0
mov r8, r3
lsls r2, 24
lsrs r6, r2, 24
ldr r1, _0805F814 @ =gUnknown_0836DC09
ldrb r0, [r4, 0x6]
adds r0, r1
ldrb r0, [r0]
adds r1, r4, 0
adds r1, 0x21
ldrb r1, [r1]
adds r2, r6, 0
bl state_to_direction
adds r6, r0, 0
mov r5, sp
adds r5, 0x2
adds r0, r4, 0
adds r1, r6, 0
mov r2, sp
adds r3, r5, 0
bl FieldObjectMoveDestCoords
adds r0, r6, 0
bl sub_80608A4
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r7, 0
bl FieldObjectSetRegularAnim
mov r0, sp
movs r2, 0
ldrsh r1, [r0, r2]
movs r0, 0
ldrsh r2, [r5, r0]
adds r0, r4, 0
adds r3, r6, 0
bl npc_block_way
lsls r0, 24
cmp r0, 0
bne _0805F7E6
mov r1, r8
cmp r1, 0
beq _0805F7FA
mov r0, sp
movs r2, 0
ldrsh r0, [r0, r2]
movs r2, 0
ldrsh r1, [r5, r2]
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl _call_via_r8
lsls r0, 24
cmp r0, 0
bne _0805F7FA
_0805F7E6:
adds r0, r6, 0
bl GetFaceDirectionAnimId
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r7, 0
bl FieldObjectSetRegularAnim
_0805F7FA:
ldrb r0, [r4]
movs r1, 0x2
orrs r0, r1
strb r0, [r4]
movs r0, 0x2
strh r0, [r7, 0x30]
movs r0, 0x1
add sp, 0x4
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
.align 2, 0
_0805F814: .4byte gUnknown_0836DC09
thumb_func_end sub_805F760
thumb_func_start oac_hopping
oac_hopping: @ 805F818
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x8
adds r4, r0, 0
adds r7, r1, 0
mov r8, r3
lsls r2, 24
lsrs r6, r2, 24
ldr r1, _0805F8DC @ =gUnknown_0836DC09
ldrb r0, [r4, 0x6]
adds r0, r1
ldrb r0, [r0]
adds r1, r4, 0
adds r1, 0x21
ldrb r1, [r1]
adds r2, r6, 0
bl state_to_direction
adds r6, r0, 0
ldrh r1, [r4, 0x10]
add r0, sp, 0x4
strh r1, [r0]
ldrh r0, [r4, 0x12]
mov r5, sp
adds r5, 0x6
strh r0, [r5]
movs r0, 0x2
str r0, [sp]
adds r0, r6, 0
add r1, sp, 0x4
adds r2, r5, 0
movs r3, 0x2
bl sub_8060320
adds r0, r6, 0
bl GetJumpLedgeAnimId
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r7, 0
bl FieldObjectSetRegularAnim
add r0, sp, 0x4
movs r2, 0
ldrsh r1, [r0, r2]
movs r0, 0
ldrsh r2, [r5, r0]
adds r0, r4, 0
adds r3, r6, 0
bl npc_block_way
lsls r0, 24
cmp r0, 0
bne _0805F8AC
mov r1, r8
cmp r1, 0
beq _0805F8C0
add r0, sp, 0x4
movs r2, 0
ldrsh r0, [r0, r2]
movs r2, 0
ldrsh r1, [r5, r2]
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl _call_via_r8
lsls r0, 24
cmp r0, 0
bne _0805F8C0
_0805F8AC:
adds r0, r6, 0
bl GetFaceDirectionAnimId
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r7, 0
bl FieldObjectSetRegularAnim
_0805F8C0:
ldrb r0, [r4]
movs r1, 0x2
orrs r0, r1
strb r0, [r4]
movs r0, 0x2
strh r0, [r7, 0x30]
movs r0, 0x1
add sp, 0x8
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
.align 2, 0
_0805F8DC: .4byte gUnknown_0836DC09
thumb_func_end oac_hopping
asm/fldeff_80C5CD4.s
+34 -34
View File
@@ -741,7 +741,7 @@ _080C627C: .4byte gMapHeader
thumb_func_start sub_80C6280
sub_80C6280: @ 80C6280
push {lr}
ldr r1, _080C6294 @ =gUnknown_0202FF84
ldr r1, _080C6294 @ =gFieldEffectArguments
ldr r0, [r1, 0x4]
cmp r0, 0x2
beq _080C62AA
@@ -751,7 +751,7 @@ sub_80C6280: @ 80C6280
beq _080C62A2
b _080C62BE
.align 2, 0
_080C6294: .4byte gUnknown_0202FF84
_080C6294: .4byte gFieldEffectArguments
_080C6298:
cmp r0, 0x3
beq _080C62AE
@@ -815,7 +815,7 @@ SetUpFieldMove_SecretPower: @ 80C62C4
bne _080C6330
bl sub_80C6264
ldr r1, _080C6320 @ =gFieldCallback
ldr r0, _080C6324 @ =sub_808AB90
ldr r0, _080C6324 @ =FieldCallback_Teleport
str r0, [r1]
ldr r1, _080C6328 @ =gUnknown_03005CE4
ldr r0, _080C632C @ =sub_80C639C
@@ -824,7 +824,7 @@ SetUpFieldMove_SecretPower: @ 80C62C4
_080C6318: .4byte gScriptResult
_080C631C: .4byte gUnknown_0203923C
_080C6320: .4byte gFieldCallback
_080C6324: .4byte sub_808AB90
_080C6324: .4byte FieldCallback_Teleport
_080C6328: .4byte gUnknown_03005CE4
_080C632C: .4byte sub_80C639C
_080C6330:
@@ -836,14 +836,14 @@ _080C6330:
bne _080C6360
bl sub_80C6264
ldr r1, _080C6350 @ =gFieldCallback
ldr r0, _080C6354 @ =sub_808AB90
ldr r0, _080C6354 @ =FieldCallback_Teleport
str r0, [r1]
ldr r1, _080C6358 @ =gUnknown_03005CE4
ldr r0, _080C635C @ =sub_80C64A8
b _080C6380
.align 2, 0
_080C6350: .4byte gFieldCallback
_080C6354: .4byte sub_808AB90
_080C6354: .4byte FieldCallback_Teleport
_080C6358: .4byte gUnknown_03005CE4
_080C635C: .4byte sub_80C64A8
_080C6360:
@@ -859,7 +859,7 @@ _080C636E:
_080C6372:
bl sub_80C6264
ldr r1, _080C638C @ =gFieldCallback
ldr r0, _080C6390 @ =sub_808AB90
ldr r0, _080C6390 @ =FieldCallback_Teleport
str r0, [r1]
ldr r1, _080C6394 @ =gUnknown_03005CE4
ldr r0, _080C6398 @ =sub_80C660C
@@ -872,7 +872,7 @@ _080C6384:
bx r1
.align 2, 0
_080C638C: .4byte gFieldCallback
_080C6390: .4byte sub_808AB90
_080C6390: .4byte FieldCallback_Teleport
_080C6394: .4byte gUnknown_03005CE4
_080C6398: .4byte sub_80C660C
thumb_func_end SetUpFieldMove_SecretPower
@@ -880,7 +880,7 @@ _080C6398: .4byte sub_80C660C
thumb_func_start sub_80C639C
sub_80C639C: @ 80C639C
push {lr}
ldr r1, _080C63B0 @ =gUnknown_0202FF84
ldr r1, _080C63B0 @ =gFieldEffectArguments
ldr r0, _080C63B4 @ =gLastFieldPokeMenuOpened
ldrb r0, [r0]
str r0, [r1]
@@ -889,7 +889,7 @@ sub_80C639C: @ 80C639C
pop {r0}
bx r0
.align 2, 0
_080C63B0: .4byte gUnknown_0202FF84
_080C63B0: .4byte gFieldEffectArguments
_080C63B4: .4byte gLastFieldPokeMenuOpened
_080C63B8: .4byte gUnknown_081A2CE6
thumb_func_end sub_80C639C
@@ -943,7 +943,7 @@ FldEff_SecretPowerCave: @ 80C63FC
ldrh r1, [r2, 0x2]
lsls r1, 23
lsrs r1, 23
ldr r4, _080C6448 @ =gUnknown_0202FF84
ldr r4, _080C6448 @ =gFieldEffectArguments
ldr r3, [r4, 0x14]
adds r1, r3
lsls r1, 16
@@ -963,7 +963,7 @@ FldEff_SecretPowerCave: @ 80C63FC
_080C643C: .4byte gSpriteTemplate_83D2614
_080C6440: .4byte gSprites
_080C6444: .4byte gPlayerAvatar
_080C6448: .4byte gUnknown_0202FF84
_080C6448: .4byte gFieldEffectArguments
thumb_func_end FldEff_SecretPowerCave
thumb_func_start sub_80C644C
@@ -1025,7 +1025,7 @@ sub_80C6498: @ 80C6498
thumb_func_start sub_80C64A8
sub_80C64A8: @ 80C64A8
push {lr}
ldr r1, _080C64BC @ =gUnknown_0202FF84
ldr r1, _080C64BC @ =gFieldEffectArguments
ldr r0, _080C64C0 @ =gLastFieldPokeMenuOpened
ldrb r0, [r0]
str r0, [r1]
@@ -1034,7 +1034,7 @@ sub_80C64A8: @ 80C64A8
pop {r0}
bx r0
.align 2, 0
_080C64BC: .4byte gUnknown_0202FF84
_080C64BC: .4byte gFieldEffectArguments
_080C64C0: .4byte gLastFieldPokeMenuOpened
_080C64C4: .4byte gUnknown_081A2D3E
thumb_func_end sub_80C64A8
@@ -1088,13 +1088,13 @@ FldEff_SecretPowerTree: @ 80C6508
ands r2, r0
cmp r2, 0x96
bne _080C652A
ldr r1, _080C6588 @ =gUnknown_0202FF84
ldr r1, _080C6588 @ =gFieldEffectArguments
movs r0, 0
str r0, [r1, 0x1C]
_080C652A:
cmp r2, 0x9C
bne _080C6534
ldr r1, _080C6588 @ =gUnknown_0202FF84
ldr r1, _080C6588 @ =gFieldEffectArguments
movs r0, 0x2
str r0, [r1, 0x1C]
_080C6534:
@@ -1110,7 +1110,7 @@ _080C6534:
ldrh r1, [r2, 0x2]
lsls r1, 23
lsrs r1, 23
ldr r4, _080C6588 @ =gUnknown_0202FF84
ldr r4, _080C6588 @ =gFieldEffectArguments
ldr r3, [r4, 0x14]
adds r1, r3
lsls r1, 16
@@ -1137,7 +1137,7 @@ _080C6576:
.align 2, 0
_080C6580: .4byte gUnknown_0203923C
_080C6584: .4byte 0x00000fff
_080C6588: .4byte gUnknown_0202FF84
_080C6588: .4byte gFieldEffectArguments
_080C658C: .4byte gSpriteTemplate_83D262C
_080C6590: .4byte gSprites
_080C6594: .4byte gPlayerAvatar
@@ -1149,7 +1149,7 @@ sub_80C6598: @ 80C6598
adds r4, r0, 0
movs r0, 0x9B
bl PlaySE
ldr r0, _080C65BC @ =gUnknown_0202FF84
ldr r0, _080C65BC @ =gFieldEffectArguments
ldr r1, [r0, 0x1C]
adds r2, r4, 0
adds r2, 0x2A
@@ -1162,7 +1162,7 @@ sub_80C6598: @ 80C6598
pop {r0}
bx r0
.align 2, 0
_080C65BC: .4byte gUnknown_0202FF84
_080C65BC: .4byte gFieldEffectArguments
_080C65C0: .4byte sub_80C65C4
thumb_func_end sub_80C6598
@@ -1177,7 +1177,7 @@ sub_80C65C4: @ 80C65C4
asrs r0, 16
cmp r0, 0x27
ble _080C65EE
ldr r0, _080C65F4 @ =gUnknown_0202FF84
ldr r0, _080C65F4 @ =gFieldEffectArguments
ldr r0, [r0, 0x1C]
cmp r0, 0
beq _080C65E2
@@ -1195,7 +1195,7 @@ _080C65EE:
pop {r0}
bx r0
.align 2, 0
_080C65F4: .4byte gUnknown_0202FF84
_080C65F4: .4byte gFieldEffectArguments
_080C65F8: .4byte sub_80C65FC
thumb_func_end sub_80C65C4
@@ -1212,7 +1212,7 @@ sub_80C65FC: @ 80C65FC
thumb_func_start sub_80C660C
sub_80C660C: @ 80C660C
push {lr}
ldr r1, _080C6620 @ =gUnknown_0202FF84
ldr r1, _080C6620 @ =gFieldEffectArguments
ldr r0, _080C6624 @ =gLastFieldPokeMenuOpened
ldrb r0, [r0]
str r0, [r1]
@@ -1221,7 +1221,7 @@ sub_80C660C: @ 80C660C
pop {r0}
bx r0
.align 2, 0
_080C6620: .4byte gUnknown_0202FF84
_080C6620: .4byte gFieldEffectArguments
_080C6624: .4byte gLastFieldPokeMenuOpened
_080C6628: .4byte gUnknown_081A2D96
thumb_func_end sub_80C660C
@@ -1275,7 +1275,7 @@ FldEff_SecretPowerShrub: @ 80C666C
ldrh r1, [r2, 0x2]
lsls r1, 23
lsrs r1, 23
ldr r4, _080C66B8 @ =gUnknown_0202FF84
ldr r4, _080C66B8 @ =gFieldEffectArguments
ldr r3, [r4, 0x14]
adds r1, r3
lsls r1, 16
@@ -1295,7 +1295,7 @@ FldEff_SecretPowerShrub: @ 80C666C
_080C66AC: .4byte gSpriteTemplate_83D2644
_080C66B0: .4byte gSprites
_080C66B4: .4byte gPlayerAvatar
_080C66B8: .4byte gUnknown_0202FF84
_080C66B8: .4byte gFieldEffectArguments
thumb_func_end FldEff_SecretPowerShrub
thumb_func_start sub_80C66BC
@@ -2103,7 +2103,7 @@ FldEff_SandPillar: @ 80C6D3C
mov r0, sp
adds r1, r4, 0
bl GetXYCoordsOneStepInFrontOfPlayer
ldr r1, _080C6D78 @ =gUnknown_0202FF84
ldr r1, _080C6D78 @ =gFieldEffectArguments
mov r0, sp
movs r2, 0
ldrsh r0, [r0, r2]
@@ -2122,7 +2122,7 @@ FldEff_SandPillar: @ 80C6D3C
beq _080C6D86
b _080C6E4C
.align 2, 0
_080C6D78: .4byte gUnknown_0202FF84
_080C6D78: .4byte gFieldEffectArguments
_080C6D7C:
cmp r0, 0x3
beq _080C6DEC
@@ -2240,7 +2240,7 @@ SpriteCB_SandPillar_0: @ 80C6E64
adds r5, r0, 0
movs r0, 0x83
bl PlaySE
ldr r4, _080C6E90 @ =gUnknown_0202FF84
ldr r4, _080C6E90 @ =gFieldEffectArguments
ldr r0, [r4, 0x14]
ldr r1, [r4, 0x18]
subs r1, 0x1
@@ -2255,7 +2255,7 @@ SpriteCB_SandPillar_0: @ 80C6E64
bl MapGridSetMetatileIdAt
b _080C6EAA
.align 2, 0
_080C6E90: .4byte gUnknown_0202FF84
_080C6E90: .4byte gFieldEffectArguments
_080C6E94: .4byte 0x00000286
_080C6E98: .4byte 0x00000e02
_080C6E9C:
@@ -2266,7 +2266,7 @@ _080C6E9C:
lsls r2, 2
bl MapGridSetMetatileIdAt
_080C6EAA:
ldr r4, _080C6ED8 @ =gUnknown_0202FF84
ldr r4, _080C6ED8 @ =gFieldEffectArguments
ldr r0, [r4, 0x14]
ldr r1, [r4, 0x18]
ldr r2, _080C6EDC @ =0x0000020a
@@ -2286,7 +2286,7 @@ _080C6EAA:
pop {r0}
bx r0
.align 2, 0
_080C6ED8: .4byte gUnknown_0202FF84
_080C6ED8: .4byte gFieldEffectArguments
_080C6EDC: .4byte 0x0000020a
_080C6EE0: .4byte SpriteCB_SandPillar_1
thumb_func_end SpriteCB_SandPillar_0
@@ -2304,7 +2304,7 @@ SpriteCB_SandPillar_1: @ 80C6EE4
strh r0, [r5, 0x2E]
b _080C6F14
_080C6EF8:
ldr r4, _080C6F1C @ =gUnknown_0202FF84
ldr r4, _080C6F1C @ =gFieldEffectArguments
ldr r0, [r4, 0x14]
ldr r1, [r4, 0x18]
ldr r2, _080C6F20 @ =0x00000e8c
@@ -2321,7 +2321,7 @@ _080C6F14:
pop {r0}
bx r0
.align 2, 0
_080C6F1C: .4byte gUnknown_0202FF84
_080C6F1C: .4byte gFieldEffectArguments
_080C6F20: .4byte 0x00000e8c
_080C6F24: .4byte SpriteCB_SandPillar_2
thumb_func_end SpriteCB_SandPillar_1
asm/macros/event.inc
+6
View File
@@ -1493,6 +1493,12 @@
callstd \type
.endm
@ Message box types
MSGBOX_YESNO = 5
YES = 1
NO = 0
.macro giveitem item, amount=1, function=0
setorcopyvar 0x8000, \item
setorcopyvar 0x8001, \amount
asm/mauville_old_man.s
-1522
View File
File diff suppressed because it is too large Load Diff
asm/party_menu.s
+12 -12
View File
@@ -7645,7 +7645,7 @@ _08070AF4:
ldr r7, _08070B28 @ =0x0201c000
ldr r0, [r7]
movs r1, 0x1
bl sub_803B7C8
bl MonTryLearningNewMove
lsls r0, 16
lsrs r4, r0, 16
ldr r1, _08070B2C @ =0xfffff282
@@ -7680,7 +7680,7 @@ _08070B40:
lsrs r2, r0, 16
cmp r2, 0
beq _08070B74
ldr r1, _08070B6C @ =gUnknown_03005E94
ldr r1, _08070B6C @ =gCB2_AfterEvolution
ldr r0, _08070B70 @ =sub_80A53F8
str r0, [r1]
ldr r0, [r7]
@@ -7692,7 +7692,7 @@ _08070B40:
bl DestroyTask
b _08070C2C
.align 2, 0
_08070B6C: .4byte gUnknown_03005E94
_08070B6C: .4byte gCB2_AfterEvolution
_08070B70: .4byte sub_80A53F8
_08070B74:
adds r0, r6, 0
@@ -7703,7 +7703,7 @@ _08070B7C:
ldr r1, _08070BBC @ =gStringVar1
bl GetMonNickname
ldr r0, _08070BC0 @ =gStringVar2
ldr r5, _08070BC4 @ =word_2024E82
ldr r5, _08070BC4 @ =gMoveToLearn
ldrh r2, [r5]
movs r1, 0xD
muls r1, r2
@@ -7729,7 +7729,7 @@ _08070B7C:
.align 2, 0
_08070BBC: .4byte gStringVar1
_08070BC0: .4byte gStringVar2
_08070BC4: .4byte word_2024E82
_08070BC4: .4byte gMoveToLearn
_08070BC8: .4byte gMoveNames
_08070BCC: .4byte gStringVar4
_08070BD0: .4byte gOtherText_WantsToLearn
@@ -7796,7 +7796,7 @@ sub_8070C54: @ 8070C54
ldr r7, _08070C78 @ =0x0201c000
ldr r0, [r7]
movs r1, 0
bl sub_803B7C8
bl MonTryLearningNewMove
lsls r0, 16
lsrs r4, r0, 16
ldr r0, _08070C7C @ =0x0000fffe
@@ -7826,7 +7826,7 @@ _08070C8C:
lsrs r2, r0, 16
cmp r2, 0
beq _08070CC0
ldr r1, _08070CB8 @ =gUnknown_03005E94
ldr r1, _08070CB8 @ =gCB2_AfterEvolution
ldr r0, _08070CBC @ =sub_80A53F8
str r0, [r1]
ldr r0, [r7]
@@ -7838,7 +7838,7 @@ _08070C8C:
bl DestroyTask
b _08070D68
.align 2, 0
_08070CB8: .4byte gUnknown_03005E94
_08070CB8: .4byte gCB2_AfterEvolution
_08070CBC: .4byte sub_80A53F8
_08070CC0:
adds r0, r6, 0
@@ -7849,7 +7849,7 @@ _08070CC8:
ldr r1, _08070D08 @ =gStringVar1
bl GetMonNickname
ldr r0, _08070D0C @ =gStringVar2
ldr r5, _08070D10 @ =word_2024E82
ldr r5, _08070D10 @ =gMoveToLearn
ldrh r2, [r5]
movs r1, 0xD
muls r1, r2
@@ -7875,7 +7875,7 @@ _08070CC8:
.align 2, 0
_08070D08: .4byte gStringVar1
_08070D0C: .4byte gStringVar2
_08070D10: .4byte word_2024E82
_08070D10: .4byte gMoveToLearn
_08070D14: .4byte gMoveNames
_08070D18: .4byte gStringVar4
_08070D1C: .4byte gOtherText_WantsToLearn
@@ -7971,7 +7971,7 @@ DoEvolutionStoneItemEffect: @ 8070DBC
adds r1, r6, 0
adds r2, r5, 0
bl sub_806E8D0
ldr r1, _08070E20 @ =gUnknown_03005E94
ldr r1, _08070E20 @ =gCB2_AfterEvolution
ldr r0, _08070E24 @ =sub_80A53F8
str r0, [r1]
ldr r0, _08070E28 @ =0x0201c000
@@ -7995,7 +7995,7 @@ DoEvolutionStoneItemEffect: @ 8070DBC
.align 2, 0
_08070E18: .4byte gTasks
_08070E1C: .4byte TaskDummy
_08070E20: .4byte gUnknown_03005E94
_08070E20: .4byte gCB2_AfterEvolution
_08070E24: .4byte sub_80A53F8
_08070E28: .4byte 0x0201c000
_08070E2C: .4byte gUnknown_0202E8F4
asm/pokeblock_feed.s
-1836
View File
File diff suppressed because it is too large Load Diff
asm/pokedex_area_screen.s
+3 -3
View File
@@ -518,7 +518,7 @@ _08110A44:
bl GetRoamerLocation
ldrb r0, [r4, 0x10]
ldrb r1, [r4, 0x11]
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
ldrb r0, [r0, 0x14]
strh r0, [r4, 0x12]
movs r3, 0x88
@@ -566,7 +566,7 @@ SetAreaHasMon: @ 8110A98
adds r0, r5
strb r1, [r0, 0x11]
adds r0, r2, 0
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
ldrb r0, [r0, 0x14]
bl sub_80FBA04
ldrh r1, [r4]
@@ -599,7 +599,7 @@ SetSpecialMapHasMon: @ 8110AE4
cmp r0, 0x1F
bhi _08110B96
adds r0, r2, 0
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
adds r6, r0, 0
ldrb r0, [r6, 0x14]
cmp r0, 0x57
asm/pokemon_menu.s
-3438
View File
File diff suppressed because it is too large Load Diff
asm/pokenav.s
+3 -3
View File
@@ -22370,7 +22370,7 @@ _080F6C3A:
adds r6, r0, r1
ldrh r7, [r6]
adds r0, r7, 0
bl trainer_flag_check
bl HasTrainerAlreadyBeenFought
lsls r0, 24
cmp r0, 0
beq _080F6CA0
@@ -22402,7 +22402,7 @@ _080F6C3A:
strb r1, [r0]
ldrh r0, [r6, 0xA]
ldrh r1, [r6, 0xC]
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
ldrh r1, [r5]
lsls r1, 3
adds r4, r1
@@ -22431,7 +22431,7 @@ _080F6CB4:
adds r5, r0, r1
ldrh r4, [r5]
adds r0, r4, 0
bl trainer_flag_check
bl HasTrainerAlreadyBeenFought
lsls r0, 24
cmp r0, 0
beq _080F6D0E
asm/reshow_battle_screen.s
-1097
View File
File diff suppressed because it is too large Load Diff
asm/shop.s
-2613
View File
File diff suppressed because it is too large Load Diff
asm/trade.s
+4 -4
View File
@@ -10512,7 +10512,7 @@ _0804D4CC:
ldrb r0, [r0]
movs r1, 0
bl sub_804BA94
ldr r1, _0804D514 @ =gUnknown_03005E94
ldr r1, _0804D514 @ =gCB2_AfterEvolution
ldr r0, _0804D518 @ =sub_804BBCC
str r0, [r1]
ldr r7, _0804D51C @ =gUnknown_020297D8
@@ -10541,7 +10541,7 @@ _0804D4CC:
b _0804D538
.align 2, 0
_0804D510: .4byte gSpecialVar_0x8005
_0804D514: .4byte gUnknown_03005E94
_0804D514: .4byte gCB2_AfterEvolution
_0804D518: .4byte sub_804BBCC
_0804D51C: .4byte gUnknown_020297D8
_0804D520: .4byte gPlayerParty
@@ -10623,7 +10623,7 @@ _0804D5A8:
.align 2, 0
_0804D5B4: .4byte gSoftResetDisabled
_0804D5B8:
ldr r0, _0804D5F4 @ =gUnknown_03005E94
ldr r0, _0804D5F4 @ =gCB2_AfterEvolution
ldr r1, _0804D5F8 @ =sub_804DC88
mov r8, r1
str r1, [r0]
@@ -10652,7 +10652,7 @@ _0804D5B8:
bl TradeEvolutionScene
b _0804D60E
.align 2, 0
_0804D5F4: .4byte gUnknown_03005E94
_0804D5F4: .4byte gCB2_AfterEvolution
_0804D5F8: .4byte sub_804DC88
_0804D5FC: .4byte gUnknown_020297D8
_0804D600: .4byte gPlayerParty
common_syms/berry_blender.txt
+1 -1
View File
@@ -1,4 +1,4 @@
gUnknown_03004830
gInGameOpponentsNo
gUnknown_03004840
gBerryBlenderData
gBerryBlenderData
common_syms/cute_sketch.txt
View File
common_syms/egg_hatch.txt
+1 -1
View File
@@ -1 +1 @@
gEggHatchData
gEggHatchData
common_syms/evolution_scene.txt
+1
View File
@@ -0,0 +1 @@
gCB2_AfterEvolution
common_syms/rom4.txt → common_syms/overworld.txt
View File
common_syms/pokeblock_feed.txt
+12
View File
@@ -0,0 +1,12 @@
gPokeblockFeedPokeSprite
gPokeblockFeedMonSpecies
gPokeblockMonNotFlipped
gPokeblockFeedMonSpriteID
gPokeblockFeedMonNature
gUnknown_03005F34
gPokeblockFeedUnused0
gUnknown_03005F3C
gUnknown_03005F40
gPokeblockFeedPokeSpriteCopy
gUnknown_03005F94
gUnknown_03005FA0
common_syms/pokemon_menu.txt
+2
View File
@@ -0,0 +1,2 @@
gLastFieldPokeMenuOpened
gUnknown_03005CE4
data-de/event_scripts.s
+51 -60
View File
@@ -919,20 +919,20 @@ Std_5:
@ 819F805
return
BattleTower_Lobby_EventScript_19F806:: @ 819F806
FallarborTown_ContestLobby_EventScript_19F806:: @ 819F806
LilycoveCity_ContestLobby_EventScript_19F806:: @ 819F806
MossdeepCity_GameCorner_1F_EventScript_19F806:: @ 819F806
OldaleTown_PokemonCenter_2F_EventScript_19F806:: @ 819F806
SecretBase_RedCave1_EventScript_19F806:: @ 819F806
special InitSaveDialog
S_DoSaveDialog:: @ 819F806
S_DoSaveDialog:: @ 819F806
S_DoSaveDialog:: @ 819F806
S_DoSaveDialog:: @ 819F806
S_DoSaveDialog:: @ 819F806
S_DoSaveDialog:: @ 819F806
special ScrSpecial_DoSaveDialog
waitstate
return
gUnknown_0819F80B:: @ 819F80B
lock
special PlayTrainerEncounterMusic
special sub_80847C8
special ScrSpecial_EndTrainerApproach
waitstate
jump EventScript_19F8F2
@@ -941,7 +941,7 @@ gUnknown_0819F818:: @ 819F818
faceplayer
move LAST_TALKED, Movement_19F8F0
waitmove 0
specialval RESULT, sub_8082564
specialval RESULT, ScrSpecial_HasTrainerBeenFought
compare RESULT, 0
jumpif 5, EventScript_19F83F
special PlayTrainerEncounterMusic
@@ -955,7 +955,7 @@ gUnknown_0819F840:: @ 819F840
lock
faceplayer
call EventScript_19F8E5
specialval RESULT, sub_8082564
specialval RESULT, ScrSpecial_HasTrainerBeenFought
compare RESULT, 0
jumpif 5, EventScript_19F877
special CheckForAlivePartyMons
@@ -966,7 +966,7 @@ gUnknown_0819F840:: @ 819F840
jump EventScript_19F8F2
EventScript_19F870:
special sub_8082718
special ScrSpecial_ShowTrainerNonBattlingSpeech
waittext
waitbutton
release
@@ -984,15 +984,15 @@ gUnknown_0819F878:: @ 819F878
gUnknown_0819F887:: @ 819F887
call EventScript_19F8E5
specialval RESULT, sub_8082C9C
specialval RESULT, ScrSpecial_GetTrainerEyeRematchFlag
compare RESULT, 0
jumpeq EventScript_19F8AD
special PlayTrainerEncounterMusic
special sub_8082524
special sub_80826D8
special ScrSpecial_ShowTrainerIntroSpeech
waittext
waitbutton
special sub_80826B0
special ScrSpecial_StartTrainerEyeRematch
waitstate
releaseall
end
@@ -1001,7 +1001,7 @@ EventScript_19F8AD:
endtrainerbattle
gUnknown_0819F8AE:: @ 819F8AE
specialval RESULT, sub_8082C9C
specialval RESULT, ScrSpecial_GetTrainerEyeRematchFlag
compare RESULT, 0
jumpeq EventScript_19F8DD
special CheckForAlivePartyMons
@@ -1009,10 +1009,10 @@ gUnknown_0819F8AE:: @ 819F8AE
jumpif 5, EventScript_19F8DE
special PlayTrainerEncounterMusic
special sub_8082524
special sub_80826D8
special ScrSpecial_ShowTrainerIntroSpeech
waittext
waitbutton
special sub_80826B0
special ScrSpecial_StartTrainerEyeRematch
waitstate
releaseall
end
@@ -1021,7 +1021,7 @@ EventScript_19F8DD:
endtrainerbattle
EventScript_19F8DE:
special sub_8082718
special ScrSpecial_ShowTrainerNonBattlingSpeech
waittext
waitbutton
release
@@ -1037,11 +1037,11 @@ Movement_19F8F0::
step_end
EventScript_19F8F2:
special sub_80826D8
special ScrSpecial_ShowTrainerIntroSpeech
waittext
waitbutton
reptrainerbattle
specialval RESULT, sub_8082558
specialval RESULT, ScrSpecial_GetTrainerBattleMode
compare RESULT, 0
jumpeq EventScript_19F934
compare RESULT, 2
@@ -1325,7 +1325,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC70:: @ 819FC70
setflag 2141
return
EventScript_LeagueWhiteOut:: @ 819FC74
S_WhiteOut:: @ 819FC74
call EverGrandeCity_HallOfFame_EventScript_19FD09
call EventScript_19FC84
jump gUnknown_0819FC9F
@@ -1438,7 +1438,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
lock
faceplayer
msgbox OldaleTown_PokemonCenter_1F_Text_1A0A7D, 5
msgbox gText_NurseJoy_Welcome, 5
compare RESULT, 1
jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FD7C
compare RESULT, 0
@@ -1447,7 +1447,7 @@ VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C
inccounter GAME_STAT_USED_POKECENTER
message OldaleTown_PokemonCenter_1F_Text_1A1245
message gText_NurseJoy_OkayIllTakeYourPokemon
waittext
move 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A083F
waitmove 0
@@ -1455,23 +1455,23 @@ OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C
checkanimation 25
move 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A0845
waitmove 0
special HealPlayerParty
special ScrSpecial_HealPlayerParty
checkflag 273
jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE
jump OldaleTown_PokemonCenter_1F_EventScript_19FDB0
end
OldaleTown_PokemonCenter_1F_EventScript_19FDB0:: @ 819FDB0
message OldaleTown_PokemonCenter_1F_Text_1A0B14
message gText_NurseJoy_ThankYouForWaiting
waittext
move 0x800b, OldaleTown_PokemonCenter_1F_Movement_19FDF4
waitmove 0
message OldaleTown_PokemonCenter_1F_Text_1A0AFA
message gText_NurseJoy_WeHopeToSeeYouAgain
waittext
return
OldaleTown_PokemonCenter_1F_EventScript_19FDC7:: @ 819FDC7
message OldaleTown_PokemonCenter_1F_Text_1A0AFA
message gText_NurseJoy_WeHopeToSeeYouAgain
waittext
return
@@ -1484,7 +1484,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE
end
OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA
message OldaleTown_PokemonCenter_1F_Text_1A1275
message gText_NurseJoy_Pokerus
waittext
setflag 273
return
@@ -1689,7 +1689,7 @@ gUnknown_081A0009:: @ 81A0009
EventScript_1A0023:
message gPCText_WhichPCShouldBeAccessed
waittext
special TryCreatePCMenu
special ScrSpecial_CreatePCMenu
waitstate
jump EventScript_1A0033
end
@@ -2112,7 +2112,7 @@ SSTidalRooms_EventScript_1A02CA:: @ 81A02CA
fadescreen 1
fanfare 368
waitfanfare
special HealPlayerParty
special ScrSpecial_HealPlayerParty
fadescreen 0
return
@@ -2986,16 +2986,16 @@ UnknownString_81A0A54: @ 81A0A54
UnknownString_81A0A66: @ 81A0A66
.string "Verbindung zu LANETTES PC hergestellt.$"
OldaleTown_PokemonCenter_1F_Text_1A0A7D:: @ 81A0A7D
gText_NurseJoy_Welcome:: @ 81A0A7D
.string "Willkommen im POKéMON-CENTER!\p"
.string "Wir heilen deine POKéMON und\n"
.string "machen sie wieder fit.\p"
.string "O.K. Wir benötigen deine POKéMON.$"
OldaleTown_PokemonCenter_1F_Text_1A0AFA:: @ 81A0AFA
gText_NurseJoy_WeHopeToSeeYouAgain:: @ 81A0AFA
.string "Komm jederzeit wieder vorbei!$"
OldaleTown_PokemonCenter_1F_Text_1A0B14:: @ 81A0B14
gText_NurseJoy_ThankYouForWaiting:: @ 81A0B14
.string "Danke!\p"
.string "Deine POKéMON sind wieder topfit!$"
@@ -3214,11 +3214,11 @@ SlateportCity_Text_1A116E:: @ 81A116E
.string "nehmen und dir unter der Hand tolle\l"
.string "Sachen verkaufen.$"
OldaleTown_PokemonCenter_1F_Text_1A1245:: @ 81A1245
gText_NurseJoy_OkayIllTakeYourPokemon:: @ 81A1245
.string "Okay, ich nehme deine POKéMON für einen\n"
.string "Moment in meine Obhut.$"
OldaleTown_PokemonCenter_1F_Text_1A1275:: @ 81A1275
gText_NurseJoy_Pokerus:: @ 81A1275
.string "Dein POKéMON scheint von dem\n"
.string "POKéRUS befallen zu sein.\p"
.string "Über den POKéRUS ist bisher wenig be-\n"
@@ -3965,7 +3965,7 @@ SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032
jumpeq SecretBase_RedCave1_EventScript_1A308F
setvar RESULT, 1
special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A308F
hidebox 0, 0, 15, 10
@@ -4000,7 +4000,7 @@ SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE
jumpeq SecretBase_RedCave1_EventScript_1A310B
setvar RESULT, 1
special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A310B
hidebox 0, 0, 15, 10
@@ -4035,7 +4035,7 @@ SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A
jumpeq SecretBase_RedCave1_EventScript_1A3187
setvar RESULT, 1
special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A3187
hidebox 0, 0, 15, 10
@@ -4070,7 +4070,7 @@ SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6
jumpeq SecretBase_RedCave1_EventScript_1A3203
setvar RESULT, 1
special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A3203
hidebox 0, 0, 15, 10
@@ -4105,7 +4105,7 @@ SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222
jumpeq SecretBase_RedCave1_EventScript_1A327F
setvar RESULT, 1
special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A327F
hidebox 0, 0, 15, 10
@@ -4140,7 +4140,7 @@ SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E
jumpeq SecretBase_RedCave1_EventScript_1A32FB
setvar RESULT, 1
special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A32FB
hidebox 0, 0, 15, 10
@@ -4175,7 +4175,7 @@ SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A
jumpeq SecretBase_RedCave1_EventScript_1A3377
setvar RESULT, 1
special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A3377
hidebox 0, 0, 15, 10
@@ -4210,7 +4210,7 @@ SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396
jumpeq SecretBase_RedCave1_EventScript_1A33F3
setvar RESULT, 1
special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A33F3
hidebox 0, 0, 15, 10
@@ -4245,7 +4245,7 @@ SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412
jumpeq SecretBase_RedCave1_EventScript_1A346F
setvar RESULT, 1
special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A346F
hidebox 0, 0, 15, 10
@@ -4280,7 +4280,7 @@ SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E
jumpeq SecretBase_RedCave1_EventScript_1A34EB
setvar RESULT, 1
special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A34EB
hidebox 0, 0, 15, 10
@@ -4309,7 +4309,7 @@ SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A
setvar 0x8005, 0
special sub_813556C
waitstate
special HealPlayerParty
special ScrSpecial_HealPlayerParty
release
end
@@ -4771,16 +4771,7 @@ BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F
.include "data/scripts/gabby_and_ty.inc"
.include "data/scripts/bard.inc"
.include "data/scripts/hipster.inc"
.include "data/text/trader.inc"
.include "data/scripts/trader.inc"
.include "data/text/storyteller.inc"
.include "data/scripts/storyteller.inc"
.include "data/text/giddy.inc"
.include "data/scripts/giddy.inc"
.include "data/text/bard.inc"
.include "data/text/hipster.inc"
.include "data/scripts/mauville_man.inc"
.include "data/field_move_scripts.inc"
.include "data/item_ball_scripts.inc"
@@ -4810,7 +4801,7 @@ gUnknown_081B694A:: @ 81B694A
.include "data/scripts/players_house.inc"
Event_RunningShoesManual:: @ 81B6E5A
S_RunningShoesManual:: @ 81B6E5A
msgbox UnknownString_81728E3, 3
end
@@ -4819,7 +4810,7 @@ Event_RunningShoesManual:: @ 81B6E5A
.include "data/text/trainers.inc"
Event_RepelWoreOff:: @ 81C33E6
S_RepelWoreOff:: @ 81C33E6
msgbox Text_RepelWoreOff, 3
end
@@ -4899,7 +4890,7 @@ GraniteCave_B1F_MapScript2_1C6BB5:: @ 81C6BB5
MtPyre_2F_MapScript2_1C6BB5:: @ 81C6BB5
SkyPillar_2F_MapScript2_1C6BB5:: @ 81C6BB5
SkyPillar_4F_MapScript2_1C6BB5:: @ 81C6BB5
map_script_2 0x4022, 0, GraniteCave_B1F_EventScript_1C6BC5
map_script_2 0x4022, 0, S_FallDownHole
.2byte 0
GraniteCave_B1F_MapScript1_1C6BBF:: @ 81C6BBF
@@ -4909,7 +4900,7 @@ SkyPillar_4F_MapScript1_1C6BBF:: @ 81C6BBF
copyvar 0x4022, 0x1
end
GraniteCave_B1F_EventScript_1C6BC5:: @ 81C6BC5
S_FallDownHole:: @ 81C6BC5
lockall
pause 20
move 255, GraniteCave_B1F_Movement_1C6BF7
data-de/field_move_scripts.inc
+10 -10
View File
@@ -1,4 +1,4 @@
CuttableTreeScript:: @ 81B0DCC
S_CuttableTree:: @ 81B0DCC
lockall
checkflag 2055
jumpif 0, CannotUseCut
@@ -18,7 +18,7 @@ CuttableTreeScript:: @ 81B0DCC
jump DoTreeCutMovement
end
UseCutScript:: @ 81B0E16
S_UseCut:: @ 81B0E16
lockall
doanimation 2
waitstate
@@ -59,7 +59,7 @@ CannotUseCutText: @ 81B0E8E
.string "Der ZERSCHNEIDER kann hier eingesetzt\n"
.string "werden.$"
BreakableRockScript:: @ 81B0EB7
S_BreakableRock:: @ 81B0EB7
lockall
checkflag 2057
jumpif 0, CannotUseRockSmash
@@ -79,7 +79,7 @@ BreakableRockScript:: @ 81B0EB7
jump DoRockSmashMovement
end
UseRockSmashScript:: @ 81B0F01
S_UseRockSmash:: @ 81B0F01
lockall
doanimation 37
waitstate
@@ -93,7 +93,7 @@ DoRockSmashMovement: @ 81B0F0C
specialval RESULT, sub_810F5BC
compare RESULT, 1
jumpeq DoRockSmashMovement_Done
special RockSmashWildEncounter
special ScrSpecial_RockSmashWildEncounter
compare RESULT, 0
jumpeq DoRockSmashMovement_Done
waitstate
@@ -126,7 +126,7 @@ CannotUseRockSmashText: @ 81B0F90
.string "Ein großer Felsen. Ein POKéMON könnte\n"
.string "ihn vielleicht zertrümmern.$"
PushableBoulderScript:: @ 81B0FCB
S_PushableBoulder:: @ 81B0FCB
lockall
checkflag 2058
jumpif 0, CannotUseStrength
@@ -145,7 +145,7 @@ PushableBoulderScript:: @ 81B0FCB
jump UsedStrength
end
UseStrengthScript:: @ 81B100E
S_UseStrength:: @ 81B100E
lockall
doanimation 40
waitstate
@@ -191,7 +191,7 @@ AlreadyUsedStrengthText: @ 81B1127
.string "STÄRKE ermöglicht es, Felsen zu\n"
.string "bewegen.$"
UseWaterfallScript:: @ 81B115A
S_UseWaterfall:: @ 81B115A
lockall
checkattack MOVE_WATERFALL
compare RESULT, 6
@@ -205,7 +205,7 @@ UseWaterfallScript:: @ 81B115A
doanimation 43
jump Waterfall_Done
CannotUseWaterfallScript:: @ 81B1194
S_CannotUseWaterfall:: @ 81B1194
lockall
Waterfall_NoMonKnows: @ 81B1195
msgbox CannotUseWaterfallText, 4
@@ -247,7 +247,7 @@ Dive_Done: @ 81B1267
releaseall
end
UnderwaterUseDiveScript:: @ 81B1269
S_UseDiveUnderwater:: @ 81B1269
lockall
checkattack MOVE_DIVE
compare RESULT, 6
data-de/text/bard.inc
+9 -9
View File
@@ -1,20 +1,20 @@
UnknownString_81B0A83: @ 81B0A83
gTextBard_BardTesting: @ 81B0A83
.string "BARDEN Test.$"
MauvilleCity_PokemonCenter_1F_Text_1B0A91:: @ 81B0A91
gTextBard_HiImTheBard:: @ 81B0A91
.string "Hallo, ich bin der BARDE.\n"
.string "Möchtest du meinem Lied lauschen?$"
MauvilleCity_PokemonCenter_1F_Text_1B0AC3:: @ 81B0AC3
gTextBard_OhYouveLeftMe:: @ 81B0AC3
.string "Oh...\n"
.string "Du überlässt mich meinem Blues?$"
MauvilleCity_PokemonCenter_1F_Text_1B0AED:: @ 81B0AED
gTextBard_OhWhatAMovingSong:: @ 81B0AED
.string "Hach, was für ein bewegendes Lied...\n"
.string "Ich wünschte, ich könnte es für\l"
.string "andere spielen...$"
MauvilleCity_PokemonCenter_1F_Text_1B0B2C:: @ 81B0B2C
gTextBard_SoHowDoYouLikeMySong:: @ 81B0B2C
.string "So?\n"
.string "Wie fandest du mein Lied?\p"
.string "Ich bin noch nicht ganz zufrieden mit\n"
@@ -22,17 +22,17 @@ MauvilleCity_PokemonCenter_1F_Text_1B0B2C:: @ 81B0B2C
.string "Hast du nicht Lust, den Text für mich\n"
.string "neu zu schreiben?$"
MauvilleCity_PokemonCenter_1F_Text_1B0BA6:: @ 81B0BA6
gTextBard_OhYouveLeftMe2:: @ 81B0BA6
.string "Oh... Und wieder werde ich meinem\n"
.string "Blues überlassen.$"
MauvilleCity_PokemonCenter_1F_Text_1B0BD0:: @ 81B0BD0
gTextBard_ThankYouKindly:: @ 81B0BD0
.string "Vielen herzlichen Dank!\n"
.string "Ich möchte für dich singen.$"
MauvilleCity_PokemonCenter_1F_Text_1B0BFA:: @ 81B0BFA
gTextBard_WasThatHowYouWanted:: @ 81B0BFA
.string "Hast du dir dein Lied so vorgestellt?$"
MauvilleCity_PokemonCenter_1F_Text_1B0C23:: @ 81B0C23
gTextBard_OkayThatsIt:: @ 81B0C23
.string "Okay! Das ist es! Dieses Lied werde\n"
.string "ich nun für eine Weile singen.$"
data-de/text/giddy.inc
+4 -4
View File
@@ -1,16 +1,16 @@
MauvilleCity_PokemonCenter_1F_Text_1B092A:: @ 81B092A
gTextGiddy_Introduction:: @ 81B092A
.string "Ich bin MÄRCHEN-MAN! Ich habe eine sehr\n"
.string "geistreiche Geschichte für dich!\p"
.string "Soll ich sie dir erzählen?$"
MauvilleCity_PokemonCenter_1F_Text_1B097C:: @ 81B097C
gTextGiddy_YouveDeflatedMe:: @ 81B097C
.string "Oh...\n"
.string "Du hast mir die Luft rausgelassen...$"
MauvilleCity_PokemonCenter_1F_Text_1B0998:: @ 81B0998
gTextGiddy_AlsoIWasThinking:: @ 81B0998
.string "Und ich war in Gedanken vertieft...$"
MauvilleCity_PokemonCenter_1F_Text_1B09B0:: @ 81B09B0
gTextGiddy_ByeBye:: @ 81B09B0
.string "Das wäre alles, glaube ich...\p"
.string "Wir sollten bald wieder ein Schwätzchen\n"
.string "halten! Tschüss!$"
data-de/text/hipster.inc
+4 -4
View File
@@ -1,18 +1,18 @@
MauvilleCity_PokemonCenter_1F_Text_1B0C5B:: @ 81B0C5B
gTextHipster_TheyCallMeTheHipster:: @ 81B0C5B
.string "Hey, yo! Man nennt mich TRENDWIG. Ich\n"
.string "zeige dir, was hip ist und abgeht.$"
MauvilleCity_PokemonCenter_1F_Text_1B0CA7:: @ 81B0CA7
gTextHipster_TaughtYouAlready:: @ 81B0CA7
.string "Aber, hey, ich habe dir doch schon ge-\n"
.string "zeigt, was hip ist und abgeht.\p"
.string "Ich will das auch anderen mitteilen.$"
MauvilleCity_PokemonCenter_1F_Text_1B0D11:: @ 81B0D11
gTextHipster_YouAlreadyKnowALot:: @ 81B0D11
.string "Aber, hey, ich habe dir doch schon ge-\n"
.string "zeigt, was hip ist und abgeht.\p"
.string "Ich habe nichts mehr in petto.$"
MauvilleCity_PokemonCenter_1F_Text_1B0D75:: @ 81B0D75
gTextHipster_HaveYouHeardAbout:: @ 81B0D75
.string "Hast du schon von\n"
.string "“{STR_VAR_1}” gehört?\p"
.string "Was das heißt? Ähäm...\n"
data-de/text/storyteller.inc
+118 -118
View File
@@ -1,25 +1,25 @@
MauvilleCity_PokemonCenter_1F_Text_1AECC6:: @ 81AECC6
gTextStoryteller_Introduction:: @ 81AECC6
.string "Ich bin der GESCHICHTENERZÄHLER.\n"
.string "Ich erzähle dir die Geschichten von\l"
.string "legendären TRAINERN.\p"
.string "Soll ich dir etwas erzählen?$"
MauvilleCity_PokemonCenter_1F_Text_1AED1D:: @ 81AED1D
gTextStoryteller_OhIFeelStifled:: @ 81AED1D
.string "Oh...\n"
.string "Keiner mag mich...$"
MauvilleCity_PokemonCenter_1F_Text_1AED35:: @ 81AED35
gTextStoryteller_WhichTale:: @ 81AED35
.string "Ich kenne viele dieser Legenden.\n"
.string "Welche möchtest du hören?$"
MauvilleCity_PokemonCenter_1F_Text_1AED70:: @ 81AED70
gTextStoryteller_ButIKnowOfNoLegendaryTrainers:: @ 81AED70
.string "Aber ich weiß nichts über legendäre\n"
.string "TRAINER. Also habe ich keine Ge-\l"
.string "schichte auf Lager.\p"
.string "Wo findet man wohl einen TRAINER, der\n"
.string "einer lebenden Legende gleicht?$"
MauvilleCity_PokemonCenter_1F_Text_1AEDE8:: @ 81AEDE8
gTextStoryteller_BirthOfANewLegend:: @ 81AEDE8
.string "Was ist?\n"
.string "Du... Du...\p"
.string "{STR_VAR_2}\n"
@@ -27,39 +27,39 @@ MauvilleCity_PokemonCenter_1F_Text_1AEDE8:: @ 81AEDE8
.string "Das ist einfach großartig!\n"
.string "Die Geburt einer neuen Legende!$"
MauvilleCity_PokemonCenter_1F_Text_1AEE50:: @ 81AEE50
gTextStoryteller_CouldThereBeOtherTrainers:: @ 81AEE50
.string "Ich überlege, ob es nicht noch andere\n"
.string "TRAINER gibt, die mir beeindruckende\l"
.string "Geschichten erzählen können.$"
MauvilleCity_PokemonCenter_1F_Text_1AEEB4:: @ 81AEEB4
gTextStoryteller_HaveYouAnyTales:: @ 81AEEB4
.string "Bist du ein TRAINER?\p"
.string "Dann sag mir, ob du Geschichten\n"
.string "für mich hast, die legendär sind?$"
MauvilleCity_PokemonCenter_1F_Text_1AEF0A:: @ 81AEF0A
gTextStoryteller_HearAnotherLegendaryTale:: @ 81AEF0A
.string "Übrigens... Möchtest du eine weitere\n"
.string "legendäre Geschichte hören?$"
MauvilleCity_PokemonCenter_1F_Text_1AEF49:: @ 81AEF49
gTextStoryteller_ImNotSatisfied:: @ 81AEF49
.string "Hmm...\n"
.string "Ich bin nicht zufrieden...\p"
.string "Ich wünschte, du würdest mir Neuig-\n"
.string "keiten erzählen, die den Titel Legende\l"
.string "verdienen.$"
MauvilleCity_PokemonCenter_1F_Text_1AEFA5:: @ 81AEFA5
gTextStoryteller_WishMorePeopleWould:: @ 81AEFA5
.string "Ich wollte, mehr Leute würden sich für\n"
.string "meine epischen Geschichten über\l"
.string "legendäre TRAINER interessieren.$"
UnknownString_81AEFFC:: @ 81AEFFC
gTextStoryteller_Story1Title:: @ 81AEFFC
.string "Der speicherfreudige TRAINER$"
UnknownString_81AF013:: @ 81AF013
gTextStoryteller_Story1Action:: @ 81AF013
.string "Hast das Spiel gespeichert?$"
UnknownString_81AF022:: @ 81AF022
gTextStoryteller_Story1Text:: @ 81AF022
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat das Spiel\n"
@@ -67,13 +67,13 @@ UnknownString_81AF022:: @ 81AF022
.string "Einen vorsichtigeren TRAINER als\n"
.string "{STR_VAR_3} wird man nicht finden!$"
UnknownString_81AF0A3:: @ 81AF0A3
gTextStoryteller_Story2Title:: @ 81AF0A3
.string "Der TRAINER als Trendsetter$"
UnknownString_81AF0BB:: @ 81AF0BB
gTextStoryteller_Story2Action:: @ 81AF0BB
.string "Hast Trends gesetzt?$"
UnknownString_81AF0CA:: @ 81AF0CA
gTextStoryteller_Story2Text:: @ 81AF0CA
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -81,13 +81,13 @@ UnknownString_81AF0CA:: @ 81AF0CA
.string "{STR_VAR_3} setzt den Trend für alle - in\n"
.string "der ganzen HOENN-Region!$"
UnknownString_81AF149:: @ 81AF149
gTextStoryteller_Story3Title:: @ 81AF149
.string "Der BEEREN pflanzende TRAINER$"
UnknownString_81AF164:: @ 81AF164
gTextStoryteller_Story3Action:: @ 81AF164
.string "Hast BEEREN gepflanzt?$"
UnknownString_81AF174:: @ 81AF174
gTextStoryteller_Story3Text:: @ 81AF174
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -95,13 +95,13 @@ UnknownString_81AF174:: @ 81AF174
.string "{STR_VAR_3} ist ein legendärer Lieb-\n"
.string "haber von BEEREN!$"
UnknownString_81AF1E5:: @ 81AF1E5
gTextStoryteller_Story4Title:: @ 81AF1E5
.string "Der RAD verrückte TRAINER$"
UnknownString_81AF1FD:: @ 81AF1FD
gTextStoryteller_Story4Action:: @ 81AF1FD
.string "Hast RÄDER getauscht?$"
UnknownString_81AF20A:: @ 81AF20A
gTextStoryteller_Story4Text:: @ 81AF20A
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -109,13 +109,13 @@ UnknownString_81AF20A:: @ 81AF20A
.string "{STR_VAR_3} ist ein TRAINER, dessen\n"
.string "Passion das RADfahren ist!$"
UnknownString_81AF281:: @ 81AF281
gTextStoryteller_Story5Title:: @ 81AF281
.string "Der Interviews gebende TRAINER$"
UnknownString_81AF299:: @ 81AF299
gTextStoryteller_Story5Action:: @ 81AF299
.string "Hast Interviews gegeben?$"
UnknownString_81AF2A9:: @ 81AF2A9
gTextStoryteller_Story5Text:: @ 81AF2A9
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER wurde {STR_VAR_1}-mal\n"
@@ -123,13 +123,13 @@ UnknownString_81AF2A9:: @ 81AF2A9
.string "{STR_VAR_3} ist ein TRAINER, der überall\n"
.string "Aufmerksamkeit erregt!$"
UnknownString_81AF32C:: @ 81AF32C
gTextStoryteller_Story6Title:: @ 81AF32C
.string "Der kampfliebende TRAINER$"
UnknownString_81AF345:: @ 81AF345
gTextStoryteller_Story6Action:: @ 81AF345
.string "Hast oft gekämpft?$"
UnknownString_81AF34D:: @ 81AF34D
gTextStoryteller_Story6Text:: @ 81AF34D
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -137,13 +137,13 @@ UnknownString_81AF34D:: @ 81AF34D
.string "{STR_VAR_3} ist ein TRAINER, der zu\n"
.string "einem Kampf nicht nein sagt!$"
UnknownString_81AF3D0:: @ 81AF3D0
gTextStoryteller_Story7Title:: @ 81AF3D0
.string "Der POKéMON fangende TRAINER$"
UnknownString_81AF3ED:: @ 81AF3ED
gTextStoryteller_Story7Action:: @ 81AF3ED
.string "Hast POKéMON gefangen?$"
UnknownString_81AF3FC:: @ 81AF3FC
gTextStoryteller_Story7Text:: @ 81AF3FC
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}\n"
@@ -151,13 +151,13 @@ UnknownString_81AF3FC:: @ 81AF3FC
.string "{STR_VAR_3} ist ein legendärer Fänger\n"
.string "von POKéMON!$"
UnknownString_81AF46D:: @ 81AF46D
gTextStoryteller_Story8Title:: @ 81AF46D
.string "Der angelnde TRAINER$"
UnknownString_81AF481:: @ 81AF481
gTextStoryteller_Story8Action:: @ 81AF481
.string "Hast POKéMON mit einer ANGEL gefangen?$"
UnknownString_81AF49B:: @ 81AF49B
gTextStoryteller_Story8Text:: @ 81AF49B
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}\n"
@@ -165,13 +165,13 @@ UnknownString_81AF49B:: @ 81AF49B
.string "{STR_VAR_3} ist ein legendärer Angel-\n"
.string "experte!$"
UnknownString_81AF511:: @ 81AF511
gTextStoryteller_Story9Title:: @ 81AF511
.string "Der EIER wärmende TRAINER$"
UnknownString_81AF529:: @ 81AF529
gTextStoryteller_Story9Action:: @ 81AF529
.string "Hast EIER ausgebrütet?$"
UnknownString_81AF536:: @ 81AF536
gTextStoryteller_Story9Text:: @ 81AF536
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Es passierte {STR_VAR_1}-mal, dass der TRAINER\n"
@@ -179,13 +179,13 @@ UnknownString_81AF536:: @ 81AF536
.string "{STR_VAR_3} ist ein legendärer Pfleger\n"
.string "von EIERN!$"
UnknownString_81AF5A9:: @ 81AF5A9
gTextStoryteller_Story10Title:: @ 81AF5A9
.string "Der TRAINER der Entwicklungen$"
UnknownString_81AF5BD:: @ 81AF5BD
gTextStoryteller_Story10Action:: @ 81AF5BD
.string "Hast POKéMON sich entwickeln lassen?$"
UnknownString_81AF5CD:: @ 81AF5CD
gTextStoryteller_Story10Text:: @ 81AF5CD
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}\n"
@@ -193,13 +193,13 @@ UnknownString_81AF5CD:: @ 81AF5CD
.string "{STR_VAR_3} ist der ultimative Ent-\n"
.string "wickler von POKéMON!$"
UnknownString_81AF63F:: @ 81AF63F
gTextStoryteller_Story11Title:: @ 81AF63F
.string "Der PKMN-CENTER liebende TRAINER$"
UnknownString_81AF661:: @ 81AF661
gTextStoryteller_Story11Action:: @ 81AF661
.string "Gingst in ein POKéMON-CENTER?$"
UnknownString_81AF676:: @ 81AF676
gTextStoryteller_Story11Text:: @ 81AF676
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat POKéMON\n"
@@ -208,13 +208,13 @@ UnknownString_81AF676:: @ 81AF676
.string "Es gibt keinen größeren Fan der\n"
.string "POKéMON-CENTER als {STR_VAR_3}!$"
UnknownString_81AF711:: @ 81AF711
gTextStoryteller_Story12Title:: @ 81AF711
.string "Der gastfreundliche TRAINER$"
UnknownString_81AF726:: @ 81AF726
gTextStoryteller_Story12Action:: @ 81AF726
.string "POKéMON haben sich bei dir erholt?$"
UnknownString_81AF73D:: @ 81AF73D
gTextStoryteller_Story12Text:: @ 81AF73D
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat POKéMON\n"
@@ -223,13 +223,13 @@ UnknownString_81AF73D:: @ 81AF73D
.string "Kein TRAINER ist so gastfreundlich\n"
.string "wie {STR_VAR_3}!$"
UnknownString_81AF7BF:: @ 81AF7BF
gTextStoryteller_Story13Title:: @ 81AF7BF
.string "Der SAFARI liebende TRAINER$"
UnknownString_81AF7D9:: @ 81AF7D9
gTextStoryteller_Story13Action:: @ 81AF7D9
.string "Bist in die SAFARI-ZONE gegangen?$"
UnknownString_81AF7F1:: @ 81AF7F1
gTextStoryteller_Story13Text:: @ 81AF7F1
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER ist {STR_VAR_1}-mal in die\n"
@@ -238,13 +238,13 @@ UnknownString_81AF7F1:: @ 81AF7F1
.string "wilde Seite in der SAFARI-ZONE zum\l"
.string "Vorschein kommt!$"
UnknownString_81AF88A:: @ 81AF88A
gTextStoryteller_Story14Title:: @ 81AF88A
.string "Der TRAINER als ZERSCHNEIDER$"
UnknownString_81AF8A1:: @ 81AF8A1
gTextStoryteller_Story14Action:: @ 81AF8A1
.string "Hast ZERSCHNEIDER eingesetzt?$"
UnknownString_81AF8AA:: @ 81AF8AA
gTextStoryteller_Story14Text:: @ 81AF8AA
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -252,13 +252,13 @@ UnknownString_81AF8AA:: @ 81AF8AA
.string "{STR_VAR_3} ist ein TRAINER, der es\n"
.string "liebt, etwas zu ZERSCHNEIDEN.$"
UnknownString_81AF91B:: @ 81AF91B
gTextStoryteller_Story15Title:: @ 81AF91B
.string "Der TRAINER als ZERTRÜMMERER$"
UnknownString_81AF935:: @ 81AF935
gTextStoryteller_Story15Action:: @ 81AF935
.string "Hast Felsen ZERTRÜMMERT?$"
UnknownString_81AF943:: @ 81AF943
gTextStoryteller_Story15Text:: @ 81AF943
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -266,13 +266,13 @@ UnknownString_81AF943:: @ 81AF943
.string "{STR_VAR_3} ist ein TRAINER, der keinen\n"
.string "Felsen unbeschädigt lassen kann.$"
UnknownString_81AF9C8:: @ 81AF9C8
gTextStoryteller_Story16Title:: @ 81AF9C8
.string "Der Umzüge liebende TRAINER$"
UnknownString_81AF9E0:: @ 81AF9E0
gTextStoryteller_Story16Action:: @ 81AF9E0
.string "Bist du mit der GEHEIMBASIS umgezogen?$"
UnknownString_81AF9F6:: @ 81AF9F6
gTextStoryteller_Story16Text:: @ 81AF9F6
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER ist {STR_VAR_1}-mal mit\n"
@@ -280,13 +280,13 @@ UnknownString_81AF9F6:: @ 81AF9F6
.string "{STR_VAR_3} ist ein TRAINER, der es\n"
.string "liebt, sich ein neues Haus einzurichten.$"
UnknownString_81AFA79:: @ 81AFA79
gTextStoryteller_Story17Title:: @ 81AFA79
.string "Der PLATSCHER des TRAINERS$"
UnknownString_81AFA92:: @ 81AFA92
gTextStoryteller_Story17Action:: @ 81AFA92
.string "Hast PLATSCHER eingesetzt?$"
UnknownString_81AFA9E:: @ 81AFA9E
gTextStoryteller_Story17Text:: @ 81AFA9E
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -294,13 +294,13 @@ UnknownString_81AFA9E:: @ 81AFA9E
.string "{STR_VAR_3} ist ein TRAINER, der es\n"
.string "liebt, zu PLATSCHEN.$"
UnknownString_81AFB17:: @ 81AFB17
gTextStoryteller_Story18Title:: @ 81AFB17
.string "Der verbissene TRAINER$"
UnknownString_81AFB2D:: @ 81AFB2D
gTextStoryteller_Story18Action:: @ 81AFB2D
.string "Hast VERZWEIFLER angewendet?$"
UnknownString_81AFB48:: @ 81AFB48
gTextStoryteller_Story18Text:: @ 81AFB48
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat sich {STR_VAR_1}-mal\n"
@@ -308,13 +308,13 @@ UnknownString_81AFB48:: @ 81AFB48
.string "{STR_VAR_3}... Ein verbissener TRAINER,\n"
.string "der auch in der Not nicht aufgibt.$"
UnknownString_81AFBD8:: @ 81AFBD8
gTextStoryteller_Story19Title:: @ 81AFBD8
.string "Der König der EINARMIGEN BANDITEN$"
UnknownString_81AFBE7:: @ 81AFBE7
gTextStoryteller_Story19Action:: @ 81AFBE7
.string "Hast den EINARMIGEN BANDITEN besiegt?$"
UnknownString_81AFC04:: @ 81AFC04
gTextStoryteller_Story19Text:: @ 81AFC04
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -322,13 +322,13 @@ UnknownString_81AFC04:: @ 81AFC04
.string "{STR_VAR_3}... Ein TRAINER, der am\n"
.string "EINARMIGEN BANDITEN Glück hat.$"
UnknownString_81AFC8A:: @ 81AFC8A
gTextStoryteller_Story20Title:: @ 81AFC8A
.string "Der König des ROULETTES$"
UnknownString_81AFC9D:: @ 81AFC9D
gTextStoryteller_Story20Action:: @ 81AFC9D
.string "Hast in Folge beim ROULETTE gewonnen,$"
UnknownString_81AFCBE:: @ 81AFCBE
gTextStoryteller_Story20Text:: @ 81AFCBE
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal in Folge\n"
@@ -336,13 +336,13 @@ UnknownString_81AFCBE:: @ 81AFCBE
.string "{STR_VAR_3}... Ein TRAINER, dem die Kugel\n"
.string "beim ROULETTE gehorcht.$"
UnknownString_81AFD44:: @ 81AFD44
gTextStoryteller_Story21Title:: @ 81AFD44
.string "Der Herausforderer im DUELLTURM$"
UnknownString_81AFD60:: @ 81AFD60
gTextStoryteller_Story21Action:: @ 81AFD60
.string "Hast Gegner im DUELLTURM gefordert?$"
UnknownString_81AFD80:: @ 81AFD80
gTextStoryteller_Story21Text:: @ 81AFD80
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal Gegner\n"
@@ -350,13 +350,13 @@ UnknownString_81AFD80:: @ 81AFD80
.string "{STR_VAR_3}... Ein TRAINER, der im DUELL-\n"
.string "TURM nach Perfektion strebt.$"
UnknownString_81AFE1D:: @ 81AFE1D
gTextStoryteller_Story22Title:: @ 81AFE1D
.string "Der mixende TRAINER$"
UnknownString_81AFE36:: @ 81AFE36
gTextStoryteller_Story22Action:: @ 81AFE36
.string "Hast {POKEBLOCK} hergestellt?$"
UnknownString_81AFE42:: @ 81AFE42
gTextStoryteller_Story22Text:: @ 81AFE42
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -364,13 +364,13 @@ UnknownString_81AFE42:: @ 81AFE42
.string "Niemand bedient den BEERENMIXER\n"
.string "besser als {STR_VAR_3}.$"
UnknownString_81AFEC2:: @ 81AFEC2
gTextStoryteller_Story23Title:: @ 81AFEC2
.string "Der Fan der WETTBEWERBE$"
UnknownString_81AFEDD:: @ 81AFEDD
gTextStoryteller_Story23Action:: @ 81AFEDD
.string "Hast an WETTBEWERBEN teilgenommen?$"
UnknownString_81AFEEE:: @ 81AFEEE
gTextStoryteller_Story23Text:: @ 81AFEEE
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -378,13 +378,13 @@ UnknownString_81AFEEE:: @ 81AFEEE
.string "{STR_VAR_3} liebt es, anderen seine\n"
.string "POKéMON zu zeigen.$"
UnknownString_81AFF68:: @ 81AFF68
gTextStoryteller_Story24Title:: @ 81AFF68
.string "Der Meister der WETTBEWERBE$"
UnknownString_81AFF7B:: @ 81AFF7B
gTextStoryteller_Story24Action:: @ 81AFF7B
.string "Hast WETTBEWERBE gewonnen?$"
UnknownString_81AFF88:: @ 81AFF88
gTextStoryteller_Story24Text:: @ 81AFF88
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -392,26 +392,26 @@ UnknownString_81AFF88:: @ 81AFF88
.string "{STR_VAR_3} ist ein unvergleichlicher\n"
.string "Meister der WETTBEWERBE.$"
UnknownString_81AFFFB:: @ 81AFFFB
gTextStoryteller_Story25Title:: @ 81AFFFB
.string "Der glückliche Einkäufer$"
UnknownString_81B000D:: @ 81B000D
gTextStoryteller_Story25Action:: @ 81B000D
.string "Bist einkaufen gegangen?$"
UnknownString_81B0015:: @ 81B0015
gTextStoryteller_Story25Text:: @ 81B0015
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
.string "in einem Geschäft Items gekauft!\p"
.string "{STR_VAR_3} ein geborener Einkäufer.$"
UnknownString_81B009D:: @ 81B009D
gTextStoryteller_Story26Title:: @ 81B009D
.string "Der TRAINER, der Items findet$"
UnknownString_81B00B6:: @ 81B00B6
gTextStoryteller_Story26Action:: @ 81B00B6
.string "Hast den DETEKTOR eingesetzt?$"
UnknownString_81B00C9:: @ 81B00C9
gTextStoryteller_Story26Text:: @ 81B00C9
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -419,13 +419,13 @@ UnknownString_81B00C9:: @ 81B00C9
.string "{STR_VAR_3} liebt es, den Boden nach\n"
.string "verborgenen Items abzusuchen.$"
UnknownString_81B014D:: @ 81B014D
gTextStoryteller_Story27Title:: @ 81B014D
.string "Der regennasse TRAINER$"
UnknownString_81B0165:: @ 81B0165
gTextStoryteller_Story27Action:: @ 81B0165
.string "Wurdest nass geregnet?$"
UnknownString_81B0173:: @ 81B0173
gTextStoryteller_Story27Text:: @ 81B0173
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER wurde {STR_VAR_1}-mal\n"
@@ -433,13 +433,13 @@ UnknownString_81B0173:: @ 81B0173
.string "Das Charisma von {STR_VAR_3} zieht\n"
.string "sogar den Regen an.$"
UnknownString_81B01E9:: @ 81B01E9
gTextStoryteller_Story28Title:: @ 81B01E9
.string "Der passionierte POKéDEX-Leser$"
UnknownString_81B0201:: @ 81B0201
gTextStoryteller_Story28Action:: @ 81B0201
.string "Hast im POKéDEX nachgeschlagen?$"
UnknownString_81B0213:: @ 81B0213
gTextStoryteller_Story28Text:: @ 81B0213
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -447,13 +447,13 @@ UnknownString_81B0213:: @ 81B0213
.string "{STR_VAR_3} liebt es, alles über\n"
.string "POKéMON im POKéDEX nachzulesen.$"
UnknownString_81B0290:: @ 81B0290
gTextStoryteller_Story29Title:: @ 81B0290
.string "Der Sammler der BÄNDER$"
UnknownString_81B02A5:: @ 81B02A5
gTextStoryteller_Story29Action:: @ 81B02A5
.string "Hast BÄNDER erhalten?$"
UnknownString_81B02B6:: @ 81B02B6
gTextStoryteller_Story29Text:: @ 81B02B6
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}\n"
@@ -461,13 +461,13 @@ UnknownString_81B02B6:: @ 81B02B6
.string "{STR_VAR_3} ist ein TRAINER, der es\n"
.string "liebt, BÄNDER zu sammeln.$"
UnknownString_81B0337:: @ 81B0337
gTextStoryteller_Story30Title:: @ 81B0337
.string "Der springende TRAINER$"
UnknownString_81B0351:: @ 81B0351
gTextStoryteller_Story30Action:: @ 81B0351
.string "Bist Absätze heruntergesprungen?$"
UnknownString_81B0364:: @ 81B0364
gTextStoryteller_Story30Text:: @ 81B0364
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER ist {STR_VAR_1}-mal\n"
@@ -476,26 +476,26 @@ UnknownString_81B0364:: @ 81B0364
.string "TRAINER {STR_VAR_3} einfach hinab-\l"
.string "springen.$"
UnknownString_81B03E9:: @ 81B03E9
gTextStoryteller_Story31Title:: @ 81B03E9
.string "Der legendäre Fernsehzuschauer$"
UnknownString_81B0401:: @ 81B0401
gTextStoryteller_Story31Action:: @ 81B0401
.string "Hast ferngeschaut?$"
UnknownString_81B040C:: @ 81B040C
gTextStoryteller_Story31Text:: @ 81B040C
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
.string "Fernsehen geschaut!\p"
.string "{STR_VAR_3} liebt es, fernzusehen.$"
UnknownString_81B046E:: @ 81B046E
gTextStoryteller_Story32Title:: @ 81B046E
.string "Der zeitbewusste TRAINER$"
UnknownString_81B0489:: @ 81B0489
gTextStoryteller_Story32Action:: @ 81B0489
.string "Hast nach der Uhrzeit gesehen?$"
UnknownString_81B049A:: @ 81B049A
gTextStoryteller_Story32Text:: @ 81B049A
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -503,13 +503,13 @@ UnknownString_81B049A:: @ 81B049A
.string "{STR_VAR_3} ist ein pünktlicher\n"
.string "TRAINER, der sich der Zeit bewusst ist.$"
UnknownString_81B0523:: @ 81B0523
gTextStoryteller_Story33Title:: @ 81B0523
.string "Der Zauberer der POKéMON-LOTTERIE$"
UnknownString_81B053E:: @ 81B053E
gTextStoryteller_Story33Action:: @ 81B053E
.string "Hast in der LOTTERIE gewonnen?$"
UnknownString_81B0554:: @ 81B0554
gTextStoryteller_Story33Text:: @ 81B0554
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -517,13 +517,13 @@ UnknownString_81B0554:: @ 81B0554
.string "TRAINER {STR_VAR_3} hat viele Freunde,\n"
.string "die mit ihm POKéMON tauschen.$"
UnknownString_81B05D8:: @ 81B05D8
gTextStoryteller_Story34Title:: @ 81B05D8
.string "Der TRAINER und die PENSION$"
UnknownString_81B05F3:: @ 81B05F3
gTextStoryteller_Story34Action:: @ 81B05F3
.string "Hast POKéMON in die PENSION gebracht?$"
UnknownString_81B0610:: @ 81B0610
gTextStoryteller_Story34Text:: @ 81B0610
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -532,13 +532,13 @@ UnknownString_81B0610:: @ 81B0610
.string "alles für die Entwicklung seiner\l"
.string "POKéMON tut.$"
UnknownString_81B06A9:: @ 81B06A9
gTextStoryteller_Story35Title:: @ 81B06A9
.string "Der SEILBAHN verrückte TRAINER$"
UnknownString_81B06C6:: @ 81B06C6
gTextStoryteller_Story35Action:: @ 81B06C6
.string "Bist mit der SEILBAHN gefahren?$"
UnknownString_81B06D9:: @ 81B06D9
gTextStoryteller_Story35Text:: @ 81B06D9
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER ist {STR_VAR_1}-mal\n"
@@ -547,13 +547,13 @@ UnknownString_81B06D9:: @ 81B06D9
.string "TRAINER, der ständig rauf und runter\l"
.string "fährt.$"
UnknownString_81B0763:: @ 81B0763
gTextStoryteller_Story36Title:: @ 81B0763
.string "Der Liebhaber der Heißen Quellen$"
UnknownString_81B0781:: @ 81B0781
gTextStoryteller_Story36Action:: @ 81B0781
.string "Hast in den Heißen Quellen gebadet?$"
UnknownString_81B0797:: @ 81B0797
gTextStoryteller_Story36Text:: @ 81B0797
.string "Dies ist die Geschichte eines TRAINERS\n"
.string "namens {STR_VAR_3}.\p"
.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
data-de/text/trader.inc
+14 -14
View File
@@ -1,58 +1,58 @@
MauvilleCity_PokemonCenter_1F_Text_1AE88F:: @ 81AE88F
gTextTrader_Introduction:: @ 81AE88F
.string "Hallo! Ich bin der HÄNDLER. Möchtest\n"
.string "du Dekorationen mit mir tauschen?$"
MauvilleCity_PokemonCenter_1F_Text_1AE8C6:: @ 81AE8C6
gTextTrader_FeelUnwanted1:: @ 81AE8C6
.string "Oh...\n"
.string "Ich fühle mich überflüssig...$"
MauvilleCity_PokemonCenter_1F_Text_1AE8DF:: @ 81AE8DF
gTextTrader_TradedAlready:: @ 81AE8DF
.string "Aber wir beide haben doch bereits\n"
.string "Dekorationen ausgetauscht.$"
MauvilleCity_PokemonCenter_1F_Text_1AE910:: @ 81AE910
gTextTrader_MenuPrompt:: @ 81AE910
.string "Wenn du etwas Dekoratives siehst, das\n"
.string "du haben möchtest, lass es mich wissen.$"
MauvilleCity_PokemonCenter_1F_Text_1AE950:: @ 81AE950
gTextTrader_DontWantAnything:: @ 81AE950
.string "Du möchtest nichts haben?\n"
.string "Ich fühle mich so überflüssig...$"
MauvilleCity_PokemonCenter_1F_Text_1AE97C:: @ 81AE97C
gTextTrader_ItemOnceBelongedTo:: @ 81AE97C
.string "Das dekorative Item gehörte einst\n"
.string "{STR_VAR_1}.\p"
.string "Möchtest du es haben?$"
MauvilleCity_PokemonCenter_1F_Text_1AE9B6:: @ 81AE9B6
gTextTrader_YouDontHaveDecorations:: @ 81AE9B6
.string "Äh... Warte eine Sekunde. Du hast über-\n"
.string "haupt kein dekoratives Item!$"
MauvilleCity_PokemonCenter_1F_Text_1AE9F8:: @ 81AE9F8
gTextTrader_PickDecorationYoullTrade:: @ 81AE9F8
.string "Okay, wähle die Dekoration aus, die du\n"
.string "mit mir tauschen willst.$"
MauvilleCity_PokemonCenter_1F_Text_1AEA2B:: @ 81AEA2B
gTextTrader_FeelUnwanted2:: @ 81AEA2B
.string "Du willst nicht mit mir tauschen?\n"
.string "Ich fühle mich überflüssig...$"
MauvilleCity_PokemonCenter_1F_Text_1AEA57:: @ 81AEA57
gTextTrader_NoRoomForThis:: @ 81AEA57
.string "Du hast keinen Platz mehr für eine/n\n"
.string "{STR_VAR_2}.$"
MauvilleCity_PokemonCenter_1F_Text_1AEA9B:: @ 81AEA9B
gTextTrader_SoWellTrade:: @ 81AEA9B
.string "Okay, dann lass uns tauschen:\n"
.string "{STR_VAR_3} gegen\l"
.string "{STR_VAR_2}!$"
MauvilleCity_PokemonCenter_1F_Text_1AEAC3:: @ 81AEAC3
gTextTrader_InUseYouCantTradeIt:: @ 81AEAC3
.string "Dieses Dekorationsstück ist im Ge-\n"
.string "brauch. Das kannst du nicht tauschen.$"
MauvilleCity_PokemonCenter_1F_Text_1AEAFB:: @ 81AEAFB
gTextTrader_ThenWellTrade:: @ 81AEAFB
.string "Dann lass uns tauschen! Ich werde meine\n"
.string "Dekorationen auf deinen PC senden.$"
MauvilleCity_PokemonCenter_1F_Text_1AEB31:: @ 81AEB31
gTextTrader_ICantTradeThatOneAway:: @ 81AEB31
.string "Huups! Tut mir Leid!\n"
.string "Das ist ein ganz seltenes Stück!\l"
.string "Das kann ich nicht tauschen!\p"
data/battle_811DA74.s
-64
View File
@@ -1,64 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gLinkPartnerBufferCommands:: @ 83FE4F4
.4byte LinkPartnerHandleGetAttributes
.4byte sub_811EC04
.4byte LinkPartnerHandleSetAttributes
.4byte sub_811F664
.4byte sub_811F6D8
.4byte sub_811F7F4
.4byte sub_811F9D0
.4byte sub_811FAE4
.4byte sub_811FC30
.4byte sub_811FC3C
.4byte sub_811FCE8
.4byte sub_811FDCC
.4byte sub_811FDD8
.4byte sub_811FDE4
.4byte sub_811FDF0
.4byte sub_811FDFC
.4byte sub_8120094
.4byte sub_81200F8
.4byte sub_8120104
.4byte sub_8120110
.4byte sub_812011C
.4byte sub_8120128
.4byte sub_8120134
.4byte sub_8120140
.4byte LinkPartnerHandleHealthBarUpdate
.4byte LinkPartnerHandleExpBarUpdate
.4byte LinkPartnerHandleStatusIconUpdate
.4byte LinkPartnerHandleStatusAnimation
.4byte sub_8120324
.4byte sub_8120330
.4byte sub_812033C
.4byte sub_8120348
.4byte sub_8120354
.4byte sub_8120360
.4byte sub_812036C
.4byte sub_8120378
.4byte sub_8120384
.4byte sub_8120390
.4byte sub_81203AC
.4byte sub_81203E4
.4byte sub_81203FC
.4byte LinkPartnerHandleHitAnimation
.4byte sub_8120494
.4byte LinkPartnerHandleEffectivenessSound
.4byte sub_81204E4
.4byte LinkPartnerHandleFaintingCry
.4byte dp01t_2E_3_battle_intro
.4byte sub_8120588
.4byte dp01t_30_3_80EB11C
.4byte sub_8120920
.4byte sub_812096C
.4byte sub_8120978
.4byte sub_81209D8
.4byte sub_8120A40
.4byte sub_8120A4C
.4byte sub_8120A58
.4byte nullsub_75
data/battle_anim_81258BC.s
-64
View File
@@ -1,64 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gSafariBufferCommands:: @ 8402080
.4byte SafariHandleGetAttributes
.4byte sub_812B870
.4byte sub_812B87C
.4byte sub_812B888
.4byte sub_812B894
.4byte sub_812B8A0
.4byte sub_812B8AC
.4byte sub_812B8B8
.4byte sub_812B994
.4byte sub_812B9A0
.4byte sub_812B9AC
.4byte sub_812B9B8
.4byte sub_812B9C4
.4byte sub_812BA14
.4byte sub_812BA70
.4byte sub_812BA7C
.4byte SafariHandlePrintString
.4byte SafariHandlePrintStringPlayerOnly
.4byte sub_812BB10
.4byte sub_812BBFC
.4byte sub_812BC08
.4byte sub_812BC14
.4byte sub_812BC54
.4byte sub_812BC60
.4byte sub_812BC6C
.4byte sub_812BC78
.4byte sub_812BC84
.4byte sub_812BCC0
.4byte sub_812BCCC
.4byte sub_812BCD8
.4byte sub_812BCE4
.4byte sub_812BCF0
.4byte sub_812BCFC
.4byte sub_812BD08
.4byte sub_812BD14
.4byte sub_812BD20
.4byte sub_812BD2C
.4byte sub_812BD38
.4byte sub_812BD44
.4byte sub_812BD50
.4byte sub_812BD5C
.4byte sub_812BD68
.4byte sub_812BD74
.4byte sub_812BD80
.4byte sub_812BDC4
.4byte sub_812BDF4
.4byte dp01t_2E_6_battle_intro
.4byte sub_812BE64
.4byte sub_812BEB0
.4byte sub_812BEBC
.4byte sub_812BEC8
.4byte sub_812BED4
.4byte sub_812BEE0
.4byte sub_812BF3C
.4byte sub_812BF48
.4byte sub_812BF54
.4byte nullsub_78
data/battle_anim_8137220.s
-64
View File
@@ -1,64 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gWallyBufferCommands:: @ 84061A4
.4byte dp01t_00_5_getattr
.4byte sub_8138230
.4byte sub_813823C
.4byte sub_8138C90
.4byte sub_8138C9C
.4byte sub_8138CA8
.4byte sub_8138CB4
.4byte sub_8138D38
.4byte sub_8138E04
.4byte sub_8138ED0
.4byte sub_8138EDC
.4byte sub_8138EE8
.4byte sub_8138EF4
.4byte sub_8138F44
.4byte sub_8138FA0
.4byte sub_8138FAC
.4byte sub_8139208
.4byte dp01t_11_5_message_for_player_only
.4byte sub_8139298
.4byte sub_8139378
.4byte sub_8139384
.4byte sub_81393EC
.4byte sub_813942C
.4byte sub_8139438
.4byte sub_8139444
.4byte sub_8139544
.4byte sub_8139550
.4byte sub_813955C
.4byte sub_8139568
.4byte sub_8139574
.4byte sub_8139580
.4byte sub_813958C
.4byte sub_8139598
.4byte sub_81395A4
.4byte sub_81395B0
.4byte sub_81395BC
.4byte sub_81395C8
.4byte sub_81395D4
.4byte sub_81395E0
.4byte sub_81395EC
.4byte sub_81395F8
.4byte sub_8139604
.4byte sub_8139674
.4byte sub_8139680
.4byte sub_81396B0
.4byte sub_81396E0
.4byte dp01t_2E_5_battle_intro
.4byte sub_8139750
.4byte sub_8139AA0
.4byte sub_8139B20
.4byte sub_8139B2C
.4byte sub_8139B38
.4byte sub_8139B44
.4byte sub_8139BA0
.4byte sub_8139BAC
.4byte sub_8139BB8
.4byte nullsub_80
data/battle_moves.inc → data/battle_moves.s
+5
View File
@@ -1,3 +1,8 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gBattleMoves:: @ 81FB12C
@ NONE
data/battle_scripts_1.s
+3 -3
View File
@@ -3485,7 +3485,7 @@ BattleScript_PerishSongTimerGoesDown:: @ 81D921D
waitmessage 64
end2
gUnknown_081D9224:: @ 81D9224
BattleScript_AllStatsUp:: @ 81D9224
jumpifstat USER, 3, 1, 12, BattleScript_1D9251
jumpifstat USER, 3, 2, 12, BattleScript_1D9251
jumpifstat USER, 3, 3, 12, BattleScript_1D9251
@@ -3659,7 +3659,7 @@ BattleScript_1D93EC: @ 81D93EC
waitmessage 64
jump BattleScript_EndTurn
gUnknown_081D93FA:: @ 81D93FA
BattleScript_AtkDefDown:: @ 81D93FA
setbyte 0x20160dc, 0
playstatchangeanimation USER, 6, 13
playstatchangeanimation USER, 2, 9
@@ -3731,7 +3731,7 @@ BattleScript_OneHitKOMsg:: @ 81D94A9
waitmessage 64
return
gUnknown_081D94B0:: @ 81D94B0
BattleScript_SAtkDown2:: @ 81D94B0
setbyte 0x20160dc, 0
playstatchangeanimation USER, 16, 11
setbyte 0x201601e, 164
data/battle_transition.s
-399
View File
@@ -1,399 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_083FBB88:: @ 83FBB88
.incbin "graphics/battle_transitions/big_pokeball.4bpp"
.align 2
gUnknown_083FC108:: @ 83FC108
.incbin "graphics/battle_transitions/pokeball_trail.4bpp"
.align 2
gSpriteImage_83FC148:: @ 83FC148
.incbin "graphics/battle_transitions/pokeball.4bpp"
.align 2
gUnknown_083FC348:: @ 83FC348
.incbin "graphics/battle_transitions/elite_four_bg.4bpp"
.align 2
gSpriteImage_83FC528:: @ 83FC528
.incbin "graphics/battle_transitions/unused_brendan.4bpp"
.align 2
gSpriteImage_83FCD28:: @ 83FCD28
.incbin "graphics/battle_transitions/unused_lass.4bpp"
.align 2
gUnknown_083FD528:: @ 83FD528
.incbin "graphics/battle_transitions/shrinking_box.4bpp"
.align 2
gUnknown_083FD708:: @ 83FD708
.4byte 0x0200c000
.align 2
gUnknown_083FD70C:: @ 83FD70C
.4byte sub_811AC64
.4byte sub_811AC64
.4byte sub_811AC64
.4byte sub_811AC64
.4byte sub_811AC64
.4byte sub_811AC64
.4byte sub_811AC64
.4byte sub_811AC64
.4byte sub_811AC64
.4byte sub_811AC64
.4byte sub_811AC64
.4byte sub_811AC64
.4byte sub_811AC64
.4byte sub_811AC64
.4byte sub_811AC64
.4byte sub_811AC64
.4byte sub_811AC64
.align 2
gBattleTransitionFuncs:: @ 83FD750
.4byte sub_811ACB4
.4byte sub_811ADAC
.4byte sub_811AF44
.4byte sub_811B0F0
.4byte sub_811B578
.4byte sub_811B7E8
.4byte sub_811BCBC
.4byte sub_811BEA0
.4byte sub_811CA5C
.4byte sub_811CCDC
.4byte sub_811D0B8
.4byte sub_811D1C8
.4byte sub_811C08C
.4byte sub_811C0AC
.4byte sub_811C0CC
.4byte sub_811C0EC
.4byte sub_811C10C
.align 2
gUnknown_083FD794:: @ 83FD794
.4byte sub_811AB88
.4byte sub_811ABD8
.4byte sub_811AC0C
.4byte sub_811AC34
.align 2
gUnknown_083FD7A4:: @ 83FD7A4
.4byte sub_811ACEC
.4byte sub_811AD1C
.4byte sub_811AD80
.align 2
gUnknown_083FD7B0:: @ 83FD7B0
.4byte sub_811ADE4
.4byte sub_811AE70
.align 2
gUnknown_083FD7B8:: @ 83FD7B8
.4byte sub_811AF7C
.4byte sub_811B000
.align 2
gUnknown_083FD7C0:: @ 83FD7C0
.4byte sub_811B128
.4byte sub_811B1D8
.4byte sub_811B268
.4byte sub_811B2F4
.4byte sub_811B380
.4byte sub_811B3EC
.align 2
gUnknown_083FD7D8:: @ 83FD7D8
.4byte sub_811B5B0
.4byte sub_811B5FC
.4byte sub_811B688
.align 1
gUnknown_083FD7E4:: @ 83FD7E4
.2byte -16
.2byte 256
.align 1
gUnknown_083FD7E8:: @ 83FD7E8
.2byte 0
.2byte 32
.2byte 64
.2byte 18
.2byte 48
.align 1
gUnknown_083FD7F2:: @ 83FD7F2
.2byte 8
.2byte -8
.align 2
gUnknown_083FD7F8:: @ 83FD7F8
.4byte sub_811B820
.4byte sub_811B884
.4byte sub_811B90C
.4byte sub_811B9F0
.4byte sub_811BA70
.4byte sub_811BB60
.4byte sub_811BBEC
.align 2
gUnknown_083FD814:: @ 83FD814
.4byte sub_811BCF4
.4byte sub_811BD60
.align 2
gUnknown_083FD81C:: @ 83FD81C
.4byte sub_811BED8
.4byte sub_811BF2C
.4byte sub_811BFC4
.align 2
gUnknown_083FD828:: @ 83FD828
.4byte sub_811C164
.4byte sub_811C1CC
.4byte sub_811C2A4
.4byte sub_811C38C
.4byte sub_811C400
.4byte sub_811C43C
.4byte sub_811C4F0
.4byte sub_811C5B4
.4byte sub_811C5E8
.4byte sub_811C630
gUnknown_083FD850:: @ 83FD850
.byte TRAINER_PIC_SIDNEY
.byte TRAINER_PIC_PHOEBE
.byte TRAINER_PIC_GLACIA
.byte TRAINER_PIC_DRAKE
.byte TRAINER_PIC_STEVEN
.align 1
gUnknown_083FD856:: @ 83FD856
.2byte 0x200, 0x200
.2byte 0x200, 0x200
.2byte 0x1B0, 0x1B0
.2byte 0x1A0, 0x1A0
.2byte 0x188, 0x188
.align 1
gUnknown_083FD86A:: @ 83FD86A
.2byte 0, 0
.2byte 0, 0
.2byte -4, 4
.2byte 0, 5
.2byte 0, 7
.align 2
gUnknown_083FD880:: @ 83FD880
.4byte sub_811C934
.4byte sub_811C938
.4byte sub_811C984
.4byte sub_811C9B8
.4byte sub_811C934
.4byte sub_811C9E4
.4byte sub_811C934
.align 1
gUnknown_083FD89C:: @ 83FD89C
.2byte 12, -12
.align 1
gUnknown_083FD8A0:: @ 83FD8A0
.2byte -1, 1
.align 2
gUnknown_083FD8A4:: @ 83FD8A4
.4byte sub_811CA94
.4byte sub_811CB20
.4byte sub_811CBE8
.align 2
gUnknown_083FD8B0:: @ 83FD8B0
.4byte sub_811CD14
.4byte sub_811CDA0
.4byte sub_811CE14
.4byte sub_811CE4C
.4byte sub_811CEB0
.align 1
gUnknown_083FD8C4:: @ 83FD8C4
.2byte 0
.2byte 20
.2byte 15
.2byte 40
.2byte 10
.2byte 25
.2byte 35
.2byte 5
.align 2
gUnknown_083FD8D4:: @ 83FD8D4
.4byte sub_811D0F0
.4byte sub_811D144
.4byte sub_811D19C
.align 2
gUnknown_083FD8E0:: @ 83FD8E0
.4byte sub_811D200
.4byte sub_811D260
.4byte sub_811D2D8
.4byte sub_811D3B0
.4byte sub_811D41C
.align 1
gUnknown_083FD8F4:: @ 83FD8F4
.2byte 56, 0, 0, 160, 0
.2byte 104, 160, 240, 88, 1
.2byte 240, 72, 56, 0, 1
.2byte 0, 32, 144, 160, 0
.2byte 144, 160, 184, 0, 1
.2byte 56, 0, 168, 160, 0
.2byte 168, 160, 48, 0, 1
.align 1
gUnknown_083FD93A:: @ 83FD93A
.2byte 8
.2byte 4
.2byte 2
.2byte 1
.2byte 1
.2byte 1
.2byte 0
.align 2
gUnknown_083FD948:: @ 83FD948
.4byte sub_811D584
.4byte sub_811D5E0
.align 2
gSpriteImageTable_83FD950:: @ 83FD950
obj_frame_tiles gSpriteImage_83FC148, 0x200
.align 2
gSpriteAnim_83FD958:: @ 83FD958
obj_image_anim_frame 0, 1
obj_image_anim_end
.align 2
gSpriteAnimTable_83FD960:: @ 83FD960
.4byte gSpriteAnim_83FD958
.align 2
gSpriteAffineAnim_83FD964:: @ 83FD964
obj_rot_scal_anim_frame 0x0, 0x0, -4, 1
obj_rot_scal_anim_jump 0
.align 2
gSpriteAffineAnim_83FD974:: @ 83FD974
obj_rot_scal_anim_frame 0x0, 0x0, 4, 1
obj_rot_scal_anim_jump 0
.align 2
gSpriteAffineAnimTable_83FD984:: @ 83FD984
.4byte gSpriteAffineAnim_83FD964
.4byte gSpriteAffineAnim_83FD974
.align 2
gSpriteTemplate_83FD98C:: @ 83FD98C
spr_template 0xFFFF, 4105, gFieldOamData_32x32, gSpriteAnimTable_83FD960, gSpriteImageTable_83FD950, gSpriteAffineAnimTable_83FD984, sub_811B720
.align 2
gOamData_83FD9A4:: @ 83FD9A4
.2byte 0x0000
.2byte 0xC000
.2byte 0x0000
.align 2
gSpriteImageTable_83FD9AC:: @ 83FD9AC
obj_frame_tiles gSpriteImage_83FC528, 0x800
.align 2
gSpriteImageTable_83FD9B4:: @ 83FD9B4
obj_frame_tiles gSpriteImage_83FCD28, 0x800
.align 2
gSpriteAnim_83FD9BC:: @ 83FD9BC
obj_image_anim_frame 0, 1
obj_image_anim_end
.align 2
gSpriteAnimTable_83FD9C4:: @ 83FD9C4
.4byte gSpriteAnim_83FD9BC
.align 2
gSpriteTemplate_83FD9C8:: @ 83FD9C8
spr_template 0xFFFF, 4106, gOamData_83FD9A4, gSpriteAnimTable_83FD9C4, gSpriteImageTable_83FD9AC, gDummySpriteAffineAnimTable, sub_811C90C
.align 2
gSpriteTemplate_83FD9E0:: @ 83FD9E0
spr_template 0xFFFF, 4106, gOamData_83FD9A4, gSpriteAnimTable_83FD9C4, gSpriteImageTable_83FD9B4, gDummySpriteAffineAnimTable, sub_811C90C
.align 2
gFieldEffectObjectPalette10:: @ 83FD9F8
.incbin "graphics/field_effect_objects/palettes/10.gbapal"
.align 2
gFieldEffectObjectPaletteInfo10:: @ 83FDA18
obj_pal gFieldEffectObjectPalette10, 0x1009
.align 2
Unknown_83FDA20:
.incbin "graphics/battle_transitions/sidney_bg.gbapal"
.align 2
Unknown_83FDA40:
.incbin "graphics/battle_transitions/phoebe_bg.gbapal"
.align 2
Unknown_83FDA60:
.incbin "graphics/battle_transitions/glacia_bg.gbapal"
.align 2
Unknown_83FDA80:
.incbin "graphics/battle_transitions/drake_bg.gbapal"
.align 2
Unknown_83FDAA0:
.incbin "graphics/battle_transitions/steven_bg.gbapal"
.align 2
Unknown_83FDAC0:
.incbin "graphics/battle_transitions/brendan_bg.gbapal"
.align 2
Unknown_83FDAE0:
.incbin "graphics/battle_transitions/may_bg.gbapal"
.align 2
gUnknown_083FDB00:: @ 83FDB00
.4byte Unknown_83FDA20
.4byte Unknown_83FDA40
.4byte Unknown_83FDA60
.4byte Unknown_83FDA80
.4byte Unknown_83FDAA0
.align 2
gUnknown_083FDB14:: @ 83FDB14
.4byte Unknown_83FDAC0
.4byte Unknown_83FDAE0
.align 2
UnusedTrainerPalette:
.incbin "graphics/battle_transitions/unused_trainer.gbapal"
.align 2
gSpritePalette_UnusedTrainer:: @ 83FDB3C
obj_pal UnusedTrainerPalette, 0x100A
.align 2
gUnknown_083FDB44:: @ 83FDB44
.incbin "graphics/battle_transitions/big_pokeball_map.bin"
.align 2
gUnknown_083FDFF4:: @ 83FDFF4
.incbin "graphics/battle_transitions/elite_four_bg_map.bin"
data/data2b.s
-210
View File
@@ -3,90 +3,6 @@
.section .rodata
.string "ターン$" @ "turn"
.align 2
gPlayerBufferCommands:: @ 81FAD98
.4byte PlayerHandleGetAttributes
.4byte sub_802ECF0
.4byte PlayerHandleSetAttributes
.4byte sub_802F7CC
.4byte PlayerHandleLoadPokeSprite
.4byte PlayerHandleSendOutPoke
.4byte PlayerHandleReturnPokeToBall
.4byte PlayerHandleTrainerThrow
.4byte PlayerHandleTrainerSlide
.4byte PlayerHandleTrainerSlideBack
.4byte sub_802FE7C
.4byte sub_802FF60
.4byte sub_802FF80
.4byte PlayerHandleBallThrow
.4byte PlayerHandlePuase
.4byte PlayerHandleMoveAnimation
.4byte PlayerHandlePrintString
.4byte PlayerHandlePrintStringPlayerOnly
.4byte sub_803037C
.4byte nullsub_42
.4byte sub_8030468
.4byte PlayerHandleOpenBag
.4byte sub_8030594
.4byte sub_8030674
.4byte PlayerHandleHealthBarUpdate
.4byte PlayerHandleExpBarUpdate
.4byte PlayerHandleStatusIconUpdate
.4byte PlayerHandleStatusAnimation
.4byte PlayerHandleStatusXor
.4byte sub_803097C
.4byte PlayerHandleDMATransfer
.4byte sub_8030A3C
.4byte sub_8030A6C
.4byte sub_8030A78
.4byte sub_8030A8C
.4byte sub_8030AA0
.4byte sub_8030AB4
.4byte sub_8030AC8
.4byte sub_8030AE4
.4byte sub_8030B1C
.4byte sub_8030B34
.4byte PlayerHandleHitAnimation
.4byte sub_8030BCC
.4byte PlayerHandleEffectivenessSound
.4byte sub_8030C1C
.4byte PlayerHandleFaintingCry
.4byte PlayerHandleIntroSlide
.4byte PlayerHandleTrainerBallThrow
.4byte sub_8030FAC
.4byte sub_80310A4
.4byte sub_80310F0
.4byte PlayerHandleSpriteInvisibility
.4byte PlayerHandleBattleAnimation
.4byte PlayerHandleLinkStandbyMsg
.4byte PlayerHandleResetActionMoveSelection
.4byte sub_80312A0
.4byte nullsub_43
gUnknown_081FAE7C:: @ 81FAE7C
.byte 0, 2, 3, 1
gUnknown_081FAE80:: @ 81FAE80
.string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW WHITE LIGHT_BLUE WHITE2}$"
gUnknown_081FAE89:: @ 81FAE89
.byte 8, 120
.byte 88, 120
.byte 8, 136
.byte 88, 136
gUnknown_081FAE91:: @ 81FAE91
.byte 144, 120
.byte 190, 120
.byte 144, 136
.byte 190, 136
.byte 72, 72
.byte 32, 90
.byte 80, 80
.byte 80, 88
.align 2
gUnknown_081FAEA4:: @ 81FAEA4
obj_tiles gSmokescreenImpactTiles, 0x180, 55019
@@ -160,129 +76,3 @@ gUnknown_081FAF4C:: @ 81FAF4C
.4byte 0x0200a000
.4byte 0x0200c000
.4byte 0x0200e000
.align 2
gOpponentBufferCommands:: @ 81FAF5C
.4byte OpponentHandleGetAttributes
.4byte dp01t_01_2_read_pokmon_data_slice
.4byte OpponentHandleSetAttributes
.4byte sub_8034744
.4byte OpponentHandleLoadPokeSprite
.4byte OpponentHandleSendOutPoke
.4byte OpponentHandleReturnPokeToBall
.4byte OpponentHandleTrainerThrow
.4byte OpponentHandleTrainerSlide
.4byte OpponentHandleTrainerSlideBack
.4byte sub_8035030
.4byte sub_80350D4
.4byte sub_80350E0
.4byte OpponentHandleBallThrow
.4byte OpponentHandlePause
.4byte OpponentHandleMoveAnimation
.4byte OpponentHandlePrintString
.4byte OpponentHandlePrintStringPlayerOnly
.4byte sub_803540C
.4byte sub_803541C
.4byte sub_8035428
.4byte sub_8035590
.4byte sub_80355C0
.4byte sub_80356C0
.4byte OpponentHandleHealthBarUpdate
.4byte OpponentHandleExpBarUpdate
.4byte OpponentHandleStatusIconUpdate
.4byte OpponentHandleStatusAnimation
.4byte OpponentHandleStatusXor
.4byte sub_80358B0
.4byte OpponentHandleDMATransfer
.4byte sub_80358C8
.4byte sub_80358D4
.4byte sub_80358E0
.4byte sub_80358EC
.4byte sub_80358F8
.4byte sub_8035904
.4byte sub_8035910
.4byte sub_803592C
.4byte sub_8035964
.4byte sub_803597C
.4byte OpponentHandleHitAnimation
.4byte sub_8035A14
.4byte OpponentHandleEffectivenessSound
.4byte sub_8035A64
.4byte OpponentHandleFaintingCry
.4byte dp01t_2E_7_battle_intro
.4byte sub_8035B04
.4byte dp01t_30_7_0803D67C
.4byte sub_8035E6C
.4byte sub_8035EB8
.4byte OpponentHandleSpriteInvisibility
.4byte OpponentHandleBattleAnimation
.4byte OpponentHandleLinkStandbyMsg
.4byte OpponentHandleResetActionMoveSelection
.4byte sub_8035FA4
.4byte nullsub_46
@ unreferenced unknown values
.byte 0xB0, 0xB0, 0xC8, 0x98, 0x28, 0x28, 0x28, 0x20
.align 2
gLinkOpponentBufferCommands:: @ 81FB048
.4byte LinkOpponentHandleGetAttributes
.4byte sub_803889C
.4byte sub_80388A8
.4byte sub_8039220
.4byte sub_8039294
.4byte sub_80393E4
.4byte sub_80395B4
.4byte sub_80396D0
.4byte sub_80398A4
.4byte sub_80398B0
.4byte sub_803995C
.4byte sub_8039A00
.4byte sub_8039A0C
.4byte sub_8039A18
.4byte sub_8039A24
.4byte sub_8039A30
.4byte sub_8039CC8
.4byte sub_8039D2C
.4byte sub_8039D38
.4byte sub_8039D44
.4byte sub_8039D50
.4byte sub_8039D5C
.4byte sub_8039D68
.4byte sub_8039D74
.4byte sub_8039D80
.4byte sub_8039E70
.4byte sub_8039E7C
.4byte sub_8039EF0
.4byte sub_8039F58
.4byte sub_8039F64
.4byte sub_8039F70
.4byte sub_8039F7C
.4byte sub_8039F88
.4byte sub_8039F94
.4byte sub_8039FA0
.4byte sub_8039FAC
.4byte sub_8039FB8
.4byte sub_8039FC4
.4byte sub_8039FE0
.4byte sub_803A018
.4byte sub_803A030
.4byte dp01t_29_4_blink
.4byte sub_803A0C8
.4byte sub_803A0D4
.4byte sub_803A118
.4byte sub_803A148
.4byte dp01t_2E_4_battle_intro
.4byte sub_803A1B8
.4byte sub_803A3DC
.4byte sub_803A520
.4byte sub_803A56C
.4byte sub_803A578
.4byte bx_exec_buffer_A_ch0_tbl4
.4byte sub_803A640
.4byte sub_803A64C
.4byte sub_803A658
.4byte nullsub_48
@ 81FB12C
.include "data/battle_moves.inc"
data/daycare.s
-17
View File
@@ -1,17 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
@ 82091DC
.include "data/egg_moves.inc"
.align 2
gUnknown_08209AC4:: @ 8209AC4
.4byte DaycareText_GetAlongVeryWell
.4byte DaycareText_GetAlong
.4byte DaycareText_DontLikeOther
.4byte DaycareText_PlayOther
gUnknown_08209AD4:: @ 8209AD4
.string "タマゴ$"
data/egg_moves.inc
-1306
View File
File diff suppressed because it is too large Load Diff
data/event_scripts.s
+50 -64
View File
@@ -918,20 +918,15 @@ Std_5:
@ 819F805
return
BattleTower_Lobby_EventScript_19F806:: @ 819F806
FallarborTown_ContestLobby_EventScript_19F806:: @ 819F806
LilycoveCity_ContestLobby_EventScript_19F806:: @ 819F806
MossdeepCity_GameCorner_1F_EventScript_19F806:: @ 819F806
OldaleTown_PokemonCenter_2F_EventScript_19F806:: @ 819F806
SecretBase_RedCave1_EventScript_19F806:: @ 819F806
special InitSaveDialog
S_DoSaveDialog:: @ 819F806
special ScrSpecial_DoSaveDialog
waitstate
return
gUnknown_0819F80B:: @ 819F80B
lock
special PlayTrainerEncounterMusic
special sub_80847C8
special ScrSpecial_EndTrainerApproach
waitstate
jump EventScript_19F8F2
@@ -940,7 +935,7 @@ gUnknown_0819F818:: @ 819F818
faceplayer
move LAST_TALKED, Movement_19F8F0
waitmove 0
specialval RESULT, sub_8082564
specialval RESULT, ScrSpecial_HasTrainerBeenFought
compare RESULT, 0
jumpif 5, EventScript_19F83F
special PlayTrainerEncounterMusic
@@ -954,7 +949,7 @@ gUnknown_0819F840:: @ 819F840
lock
faceplayer
call EventScript_19F8E5
specialval RESULT, sub_8082564
specialval RESULT, ScrSpecial_HasTrainerBeenFought
compare RESULT, 0
jumpif 5, EventScript_19F877
special CheckForAlivePartyMons
@@ -965,7 +960,7 @@ gUnknown_0819F840:: @ 819F840
jump EventScript_19F8F2
EventScript_19F870:
special sub_8082718
special ScrSpecial_ShowTrainerNonBattlingSpeech
waittext
waitbutton
release
@@ -983,15 +978,15 @@ gUnknown_0819F878:: @ 819F878
gUnknown_0819F887:: @ 819F887
call EventScript_19F8E5
specialval RESULT, sub_8082C9C
specialval RESULT, ScrSpecial_GetTrainerEyeRematchFlag
compare RESULT, 0
jumpeq EventScript_19F8AD
special PlayTrainerEncounterMusic
special sub_8082524
special sub_80826D8
special ScrSpecial_ShowTrainerIntroSpeech
waittext
waitbutton
special sub_80826B0
special ScrSpecial_StartTrainerEyeRematch
waitstate
releaseall
end
@@ -1000,7 +995,7 @@ EventScript_19F8AD:
endtrainerbattle
gUnknown_0819F8AE:: @ 819F8AE
specialval RESULT, sub_8082C9C
specialval RESULT, ScrSpecial_GetTrainerEyeRematchFlag
compare RESULT, 0
jumpeq EventScript_19F8DD
special CheckForAlivePartyMons
@@ -1008,10 +1003,10 @@ gUnknown_0819F8AE:: @ 819F8AE
jumpif 5, EventScript_19F8DE
special PlayTrainerEncounterMusic
special sub_8082524
special sub_80826D8
special ScrSpecial_ShowTrainerIntroSpeech
waittext
waitbutton
special sub_80826B0
special ScrSpecial_StartTrainerEyeRematch
waitstate
releaseall
end
@@ -1020,7 +1015,7 @@ EventScript_19F8DD:
endtrainerbattle
EventScript_19F8DE:
special sub_8082718
special ScrSpecial_ShowTrainerNonBattlingSpeech
waittext
waitbutton
release
@@ -1036,11 +1031,11 @@ Movement_19F8F0::
step_end
EventScript_19F8F2:
special sub_80826D8
special ScrSpecial_ShowTrainerIntroSpeech
waittext
waitbutton
reptrainerbattle
specialval RESULT, sub_8082558
specialval RESULT, ScrSpecial_GetTrainerBattleMode
compare RESULT, 0
jumpeq EventScript_19F934
compare RESULT, 2
@@ -1324,7 +1319,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC70:: @ 819FC70
setflag 2141
return
EventScript_LeagueWhiteOut:: @ 819FC74
S_WhiteOut:: @ 819FC74
call EverGrandeCity_HallOfFame_EventScript_19FD09
call EventScript_19FC84
jump gUnknown_0819FC9F
@@ -1437,16 +1432,16 @@ SootopolisCity_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
lock
faceplayer
msgbox OldaleTown_PokemonCenter_1F_Text_1A0A7D, 5
msgbox gText_NurseJoy_Welcome, MSGBOX_YESNO
compare RESULT, 1
jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FD7C
jumpeq do_heal_party
compare RESULT, 0
jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FDC7
jumpeq dont_heal_party
end
OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C
do_heal_party:: @ 819FD7C
inccounter GAME_STAT_USED_POKECENTER
message OldaleTown_PokemonCenter_1F_Text_1A1245
message gText_NurseJoy_OkayIllTakeYourPokemon
waittext
move 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A083F
waitmove 0
@@ -1454,23 +1449,23 @@ OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C
checkanimation 25
move 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A0845
waitmove 0
special HealPlayerParty
special ScrSpecial_HealPlayerParty
checkflag 273
jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE
jump OldaleTown_PokemonCenter_1F_EventScript_19FDB0
end
OldaleTown_PokemonCenter_1F_EventScript_19FDB0:: @ 819FDB0
message OldaleTown_PokemonCenter_1F_Text_1A0B14
message gText_NurseJoy_ThankYouForWaiting
waittext
move 0x800b, OldaleTown_PokemonCenter_1F_Movement_19FDF4
waitmove 0
message OldaleTown_PokemonCenter_1F_Text_1A0AFA
message gText_NurseJoy_WeHopeToSeeYouAgain
waittext
return
OldaleTown_PokemonCenter_1F_EventScript_19FDC7:: @ 819FDC7
message OldaleTown_PokemonCenter_1F_Text_1A0AFA
dont_heal_party:: @ 819FDC7
message gText_NurseJoy_WeHopeToSeeYouAgain
waittext
return
@@ -1483,7 +1478,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE
end
OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA
message OldaleTown_PokemonCenter_1F_Text_1A1275
message gText_NurseJoy_Pokerus
waittext
setflag 273
return
@@ -1688,7 +1683,7 @@ gUnknown_081A0009:: @ 81A0009
EventScript_1A0023:
message gPCText_WhichPCShouldBeAccessed
waittext
special TryCreatePCMenu
special ScrSpecial_CreatePCMenu
waitstate
jump EventScript_1A0033
end
@@ -2111,7 +2106,7 @@ SSTidalRooms_EventScript_1A02CA:: @ 81A02CA
fadescreen 1
fanfare 368
waitfanfare
special HealPlayerParty
special ScrSpecial_HealPlayerParty
fadescreen 0
return
@@ -2985,17 +2980,17 @@ UnknownString_81A0A54: @ 81A0A54
UnknownString_81A0A66: @ 81A0A66
.string "Accessed LANETTE’s PC.$"
OldaleTown_PokemonCenter_1F_Text_1A0A7D:: @ 81A0A7D
gText_NurseJoy_Welcome:: @ 81A0A7D
.string "Hello, and welcome to the POKéMON\n"
.string "CENTER.\p"
.string "We restore your tired POKéMON to\n"
.string "full health.\p"
.string "Would you like to rest your POKéMON?$"
OldaleTown_PokemonCenter_1F_Text_1A0AFA:: @ 81A0AFA
gText_NurseJoy_WeHopeToSeeYouAgain:: @ 81A0AFA
.string "We hope to see you again!$"
OldaleTown_PokemonCenter_1F_Text_1A0B14:: @ 81A0B14
gText_NurseJoy_ThankYouForWaiting:: @ 81A0B14
.string "Thank you for waiting.\p"
.string "We’ve restored your POKéMON to\n"
.string "full health.$"
@@ -3209,11 +3204,11 @@ SlateportCity_Text_1A116E:: @ 81A116E
.string "We’ll accept you as a member and sell\n"
.string "you good stuff in secrecy.$"
OldaleTown_PokemonCenter_1F_Text_1A1245:: @ 81A1245
gText_NurseJoy_OkayIllTakeYourPokemon:: @ 81A1245
.string "Okay, I’ll take your POKéMON for a\n"
.string "few seconds.$"
OldaleTown_PokemonCenter_1F_Text_1A1275:: @ 81A1275
gText_NurseJoy_Pokerus:: @ 81A1275
.string "Your POKéMON may be infected with\n"
.string "POKéRUS.\p"
.string "Little is known about the POKéRUS\n"
@@ -3949,7 +3944,7 @@ SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032
jumpeq SecretBase_RedCave1_EventScript_1A308F
setvar RESULT, 1
special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A308F
hidebox 0, 0, 15, 10
@@ -3984,7 +3979,7 @@ SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE
jumpeq SecretBase_RedCave1_EventScript_1A310B
setvar RESULT, 1
special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A310B
hidebox 0, 0, 15, 10
@@ -4019,7 +4014,7 @@ SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A
jumpeq SecretBase_RedCave1_EventScript_1A3187
setvar RESULT, 1
special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A3187
hidebox 0, 0, 15, 10
@@ -4054,7 +4049,7 @@ SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6
jumpeq SecretBase_RedCave1_EventScript_1A3203
setvar RESULT, 1
special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A3203
hidebox 0, 0, 15, 10
@@ -4089,7 +4084,7 @@ SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222
jumpeq SecretBase_RedCave1_EventScript_1A327F
setvar RESULT, 1
special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A327F
hidebox 0, 0, 15, 10
@@ -4124,7 +4119,7 @@ SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E
jumpeq SecretBase_RedCave1_EventScript_1A32FB
setvar RESULT, 1
special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A32FB
hidebox 0, 0, 15, 10
@@ -4159,7 +4154,7 @@ SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A
jumpeq SecretBase_RedCave1_EventScript_1A3377
setvar RESULT, 1
special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A3377
hidebox 0, 0, 15, 10
@@ -4194,7 +4189,7 @@ SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396
jumpeq SecretBase_RedCave1_EventScript_1A33F3
setvar RESULT, 1
special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A33F3
hidebox 0, 0, 15, 10
@@ -4229,7 +4224,7 @@ SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412
jumpeq SecretBase_RedCave1_EventScript_1A346F
setvar RESULT, 1
special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A346F
hidebox 0, 0, 15, 10
@@ -4264,7 +4259,7 @@ SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E
jumpeq SecretBase_RedCave1_EventScript_1A34EB
setvar RESULT, 1
special sub_80BCE4C
call SecretBase_RedCave1_EventScript_19F806
call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A34EB
hidebox 0, 0, 15, 10
@@ -4293,7 +4288,7 @@ SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A
setvar 0x8005, 0
special sub_813556C
waitstate
special HealPlayerParty
special ScrSpecial_HealPlayerParty
release
end
@@ -4744,16 +4739,7 @@ BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F
.include "data/scripts/gabby_and_ty.inc"
.include "data/scripts/bard.inc"
.include "data/scripts/hipster.inc"
.include "data/text/trader.inc"
.include "data/scripts/trader.inc"
.include "data/text/storyteller.inc"
.include "data/scripts/storyteller.inc"
.include "data/text/giddy.inc"
.include "data/scripts/giddy.inc"
.include "data/text/bard.inc"
.include "data/text/hipster.inc"
.include "data/scripts/mauville_man.inc"
.include "data/field_move_scripts.inc"
.include "data/item_ball_scripts.inc"
@@ -4783,7 +4769,7 @@ gUnknown_081B694A:: @ 81B694A
.include "data/scripts/players_house.inc"
Event_RunningShoesManual:: @ 81B6E5A
S_RunningShoesManual:: @ 81B6E5A
msgbox UnknownString_81728E3, 3
end
@@ -4792,7 +4778,7 @@ Event_RunningShoesManual:: @ 81B6E5A
.include "data/text/trainers.inc"
Event_RepelWoreOff:: @ 81C33E6
S_RepelWoreOff:: @ 81C33E6
msgbox Text_RepelWoreOff, 3
end
@@ -4872,7 +4858,7 @@ GraniteCave_B1F_MapScript2_1C6BB5:: @ 81C6BB5
MtPyre_2F_MapScript2_1C6BB5:: @ 81C6BB5
SkyPillar_2F_MapScript2_1C6BB5:: @ 81C6BB5
SkyPillar_4F_MapScript2_1C6BB5:: @ 81C6BB5
map_script_2 0x4022, 0, GraniteCave_B1F_EventScript_1C6BC5
map_script_2 0x4022, 0, S_FallDownHole
.2byte 0
GraniteCave_B1F_MapScript1_1C6BBF:: @ 81C6BBF
@@ -4882,7 +4868,7 @@ SkyPillar_4F_MapScript1_1C6BBF:: @ 81C6BBF
copyvar 0x4022, 0x1
end
GraniteCave_B1F_EventScript_1C6BC5:: @ 81C6BC5
S_FallDownHole:: @ 81C6BC5
lockall
pause 20
move 255, GraniteCave_B1F_Movement_1C6BF7
data/evolution_graphics.s
-70
View File
@@ -1,70 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gEvoSparklePalette: @ 8416E44
.incbin "graphics/misc/evo_sparkle.gbapal"
.align 2
gEvoSparkleTiles: @ 8416E64
.incbin "graphics/misc/evo_sparkle.4bpp.lz"
gUnknown_08416E84:: @ 8416E84
obj_tiles gEvoSparkleTiles, 0x20, 1001
.space 8
gUnknown_08416E94:: @ 8416E94
obj_pal gEvoSparklePalette, 1001
.space 8
.align 2
gOamData_8416EA4:: @ 8416EA4
.2byte 0x00A0
.2byte 0x0000
.2byte 0x0400
.align 2
gSpriteAnim_8416EAC:: @ 8416EAC
obj_image_anim_frame 0, 8
obj_image_anim_end
.align 2
gSpriteAnimTable_8416EB4:: @ 8416EB4
.4byte gSpriteAnim_8416EAC
.align 2
gSpriteTemplate_8416EB8:: @ 8416EB8
spr_template 1001, 1001, gOamData_8416EA4, gSpriteAnimTable_8416EB4, NULL, gDummySpriteAffineAnimTable, nullsub_84
.align 1
gUnknown_08416ED0:: @ 8416ED0
.2byte 0x3C0
.2byte 0x380
.2byte 0x340
.2byte 0x300
.2byte 0x2C0
.2byte 0x280
.2byte 0x240
.2byte 0x200
.2byte 0x1C0
.2byte 0x180
.2byte 0x140
.2byte 0x100
.2byte 0xFFFC
.2byte 0x10
.2byte 0xFFFD
.2byte 0x30
.2byte 0xFFFE
.2byte 0x50
.2byte 0xFFFF
.2byte 0x70
.2byte 0x1
.2byte 0x70
.2byte 0x2
.2byte 0x50
.2byte 0x3
.2byte 0x30
.2byte 0x4
.2byte 0x10
data/evolution_scene.s
-14
View File
@@ -1,14 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_083F868C:: @ 83F868C
.string "ヌケニン$"
.string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}$"
.string "▶\n $"
.string " \n▶$"
.string " \n $"
.space 9
data/field_effect_helpers.s
-37
View File
@@ -1,37 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
@ XXX: Unused? Probably aligned because it's at the beginning of an object file.
.align 2
.string "タマゴ$"
.align 1
gUnknown_08401E2C:: @ 8401E2C
.2byte 0xC, 0x1C, 0x2C
gUnknown_08401E32:: @ 8401E32
.byte 0, 1, 2, 3
.align 1
gUnknown_08401E36:: @ 8401E36
.2byte 4, 4, 4, 16
.align 2
gUnknown_08401E40:: @ 8401E40
.4byte sub_81275A0
.4byte sub_81275C4
.align 2
gUnknown_08401E48:: @ 8401E48
.4byte sub_8127DA0
.4byte sub_8127DD0
.4byte sub_8127E30
gUnknown_08401E54:: @ 8401E54
.byte 0, 0, 1, 2, 3
.align 1
gUnknown_08401E5A:: @ 8401E5A
.2byte 3, 7
data/field_ground_effect.s
-72
View File
@@ -1,72 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_08376040:: @ 8376040
.4byte MetatileBehavior_IsJumpSouth
.4byte MetatileBehavior_IsJumpNorth
.4byte MetatileBehavior_IsJumpWest
.4byte MetatileBehavior_IsJumpEast
gUnknown_08376050:: @ 8376050
.byte 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73
@ Each byte corresponds to a sprite priority for a field object.
@ This is directly the inverse of gFieldObjectPriorities_08376070.
gFieldObjectPriorities_08376060:: @ 8376060
.byte 2, 2, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 0, 0, 2
@ Each byte corresponds to a sprite priority for a field object.
@ This is the inverse of gFieldObjectPriorities_08376060.
@ 1 = Above player sprite
@ 2 = Below player sprite
gFieldObjectPriorities_08376070:: @ 8376070
.byte 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 0, 0, 1
.align 2
gUnknown_08376080:: @ 8376080
.4byte nullsub_50
.4byte DoTracksGroundEffect_Footprints
.4byte DoTracksGroundEffect_BikeTireTracks
@ First byte is a Field Effect script id. (gFieldEffectScriptPointers)
@ Last three bytes are unknown.
gSandFootprints_FieldEffectData:: @ 837608C
.byte 0xD, 0x0, 0x18, 0x0
@ Specifies which bike track shape to show next.
@ For example, when the bike turns from up to right, it will show
@ a track that curves to the right.
@ Each 4-byte row corresponds to the initial direction of the bike, and
@ each byte in that row is for the next direction of the bike in the order
@ of down, up, left, right.
gBikeTireTracks_Transitions:: @ 8376090
.byte 1, 2, 7, 8
.byte 1, 2, 6, 5
.byte 5, 8, 3, 4
.byte 6, 7, 3, 4
.align 2
gUnknown_083760A0:: @ 83760A0
.4byte GroundEffect_SpawnOnTallGrass
.4byte sub_8063E94
.4byte sub_8063EE0
.4byte sub_8063F2C
.4byte GroundEffect_WaterReflection
.4byte GroundEffect_IceReflection
.4byte GroundEffect_FlowingWater
.4byte sub_8063FA0
.4byte sub_8063FCC
.4byte GroundEffect_Ripple
.4byte GroundEffect_StepOnPuddle
.4byte GroundEffect_SandPile
.4byte GroundEffect_JumpOnTallGrass
.4byte GroundEffect_JumpOnLongGrass
.4byte GroundEffect_JumpOnShallowWater
.4byte GroundEffect_JumpOnWater
.4byte GroundEffect_JumpLandingDust
.4byte GroundEffect_ShortGrass
.4byte GroundEffect_HotSprings
.4byte GroundEffect_Seaweed
data/field_move_scripts.inc
+10 -10
View File
@@ -1,4 +1,4 @@
CuttableTreeScript:: @ 81B0DCC
S_CuttableTree:: @ 81B0DCC
lockall
checkflag 2055
jumpif 0, CannotUseCut
@@ -18,7 +18,7 @@ CuttableTreeScript:: @ 81B0DCC
jump DoTreeCutMovement
end
UseCutScript:: @ 81B0E16
S_UseCut:: @ 81B0E16
lockall
doanimation 2
waitstate
@@ -56,7 +56,7 @@ UsedCutRockSmashText: @ 81B0E82
CannotUseCutText: @ 81B0E8E
.string "This tree looks like it can be CUT down.$"
BreakableRockScript:: @ 81B0EB7
S_BreakableRock:: @ 81B0EB7
lockall
checkflag 2057
jumpif 0, CannotUseRockSmash
@@ -76,7 +76,7 @@ BreakableRockScript:: @ 81B0EB7
jump DoRockSmashMovement
end
UseRockSmashScript:: @ 81B0F01
S_UseRockSmash:: @ 81B0F01
lockall
doanimation 37
waitstate
@@ -90,7 +90,7 @@ DoRockSmashMovement: @ 81B0F0C
specialval RESULT, sub_810F5BC
compare RESULT, 1
jumpeq DoRockSmashMovement_Done
special RockSmashWildEncounter
special ScrSpecial_RockSmashWildEncounter
compare RESULT, 0
jumpeq DoRockSmashMovement_Done
waitstate
@@ -123,7 +123,7 @@ CannotUseRockSmashText: @ 81B0F90
.string "It’s a rugged rock, but a POKéMON\n"
.string "may be able to smash it.$"
PushableBoulderScript:: @ 81B0FCB
S_PushableBoulder:: @ 81B0FCB
lockall
checkflag 2058
jumpif 0, CannotUseStrength
@@ -142,7 +142,7 @@ PushableBoulderScript:: @ 81B0FCB
jump UsedStrength
end
UseStrengthScript:: @ 81B100E
S_UseStrength:: @ 81B100E
lockall
doanimation 40
waitstate
@@ -188,7 +188,7 @@ AlreadyUsedStrengthText: @ 81B1127
.string "STRENGTH made it possible to move\n"
.string "boulders around.$"
UseWaterfallScript:: @ 81B115A
S_UseWaterfall:: @ 81B115A
lockall
checkattack MOVE_WATERFALL
compare RESULT, 6
@@ -202,7 +202,7 @@ UseWaterfallScript:: @ 81B115A
doanimation 43
jump Waterfall_Done
CannotUseWaterfallScript:: @ 81B1194
S_CannotUseWaterfall:: @ 81B1194
lockall
Waterfall_NoMonKnows: @ 81B1195
msgbox CannotUseWaterfallText, 4
@@ -244,7 +244,7 @@ Dive_Done: @ 81B1267
releaseall
end
UnderwaterUseDiveScript:: @ 81B1269
S_UseDiveUnderwater:: @ 81B1269
lockall
checkattack MOVE_DIVE
compare RESULT, 6
data/maps/events/FieryPath.inc
+6 -6
View File
@@ -1,11 +1,11 @@
FieryPath_MapObjects:: @ 838C718
object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17EE, 1091, 0, 0
object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0
object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0
object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0
object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0
object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 23, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0
object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0
object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0
object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0
object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 23, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0
object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0
object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 32, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17E1, 1111, 0, 0
FieryPath_MapWarps:: @ 838C7D8
data/maps/events/GraniteCave_B2F.inc
+7 -7
View File
@@ -1,13 +1,13 @@
GraniteCave_B2F_MapObjects:: @ 838BFEC
object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, 1053, 0, 0
object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, 1054, 0, 0
object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0
object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0
object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0
object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 20, 0, 0
object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0
object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 22, 0, 0
object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 23, 0, 0
object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0
object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0
object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0
object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0
object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0
object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0
object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 23, 0, 0
GraniteCave_B2F_MapWarps:: @ 838C0C4
warp_def 29, 13, 3, 2, GraniteCave_B1F
data/maps/events/PetalburgWoods.inc
+2 -2
View File
@@ -1,6 +1,6 @@
PetalburgWoods_MapObjects:: @ 838C14C
object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0
object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0
object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0
object_event 3, 241, 0, 26, 0, 17, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 725, 0, 0
object_event 4, MAP_OBJ_GFX_MAN_2, 0, 26, 0, 20, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 724, 0, 0
object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 45, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, 1056, 0, 0
data/maps/events/Route102.inc
+2 -2
View File
@@ -5,8 +5,8 @@ Route102_MapObjects:: @ 83811FC
object_event 4, MAP_OBJ_GFX_LASS, 0, 8, 0, 7, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route102_EventScript_14EB53, 0, 0, 0
object_event 5, MAP_OBJ_GFX_BOY_1, 0, 37, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route102_EventScript_14EAF5, 0, 0, 0
object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 15, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route102_EventScript_1B1439, 1000, 0, 0
object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 2, 0, 3, 12, 0, 0, 0, 0, 2, 0, BerryTreeScript, 0, 0, 0
object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 2, 0, 3, 12, 0, 0, 0, 0, 1, 0, BerryTreeScript, 0, 0, 0
object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 2, 0, 3, 12, 0, 0, 0, 0, 2, 0, S_BerryTree, 0, 0, 0
object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 2, 0, 3, 12, 0, 0, 0, 0, 1, 0, S_BerryTree, 0, 0, 0
object_event 9, MAP_OBJ_GFX_YOUNGSTER, 0, 19, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route102_EventScript_14EB6A, 0, 0, 0
Route102_MapBGEvents:: @ 83812D4
data/maps/events/Route103.inc
+5 -5
View File
@@ -5,15 +5,15 @@ Route103_MapObjects:: @ 8381300
object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDF1, 0, 0, 0
object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDAB, 0, 0, 0
object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 50, 0, 8, 0, 3, 26, 16, 0, 1, 0, 3, 0, Route103_EventScript_14EE37, 0, 0, 0
object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 58, 0, 5, 0, 3, 12, 0, 0, 0, 0, 5, 0, BerryTreeScript, 0, 0, 0
object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 59, 0, 5, 0, 3, 12, 0, 0, 0, 0, 6, 0, BerryTreeScript, 0, 0, 0
object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 60, 0, 5, 0, 3, 12, 0, 0, 0, 0, 7, 0, BerryTreeScript, 0, 0, 0
object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 58, 0, 5, 0, 3, 12, 0, 0, 0, 0, 5, 0, S_BerryTree, 0, 0, 0
object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 59, 0, 5, 0, 3, 12, 0, 0, 0, 0, 6, 0, S_BerryTree, 0, 0, 0
object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 60, 0, 5, 0, 3, 12, 0, 0, 0, 0, 7, 0, S_BerryTree, 0, 0, 0
object_event 10, MAP_OBJ_GFX_BOY_1, 0, 20, 0, 10, 0, 3, 2, 33, 0, 0, 0, 0, 0, Route103_EventScript_14ED79, 0, 0, 0
object_event 11, MAP_OBJ_GFX_PROF_BIRCH, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route103_EventScript_1A037F, 898, 0, 0
object_event 12, MAP_OBJ_GFX_MAN_3, 0, 56, 0, 12, 0, 3, 10, 0, 0, 1, 0, 5, 0, Route103_EventScript_14EE4E, 0, 0, 0
object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 63, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route103_EventScript_1B1446, 1114, 0, 0
object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0
object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0
object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0
object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0
Route103_MapBGEvents:: @ 8381468
bg_event 11, 9, 0, 0, 0, Route103_EventScript_14ED8B
data/maps/events/Route104.inc
+11 -11
View File
@@ -8,17 +8,17 @@ Route104_MapObjects:: @ 8381488
object_event 7, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 54, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, 742, 0, 0
object_event 8, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 51, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, 738, 0, 0
object_event 9, MAP_OBJ_GFX_FISHERMAN, 0, 29, 0, 8, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F172, 0, 0, 0
object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 6, 0, 3, 12, 0, 0, 0, 0, 8, 0, BerryTreeScript, 0, 0, 0
object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 6, 0, 3, 12, 0, 0, 0, 0, 9, 0, BerryTreeScript, 0, 0, 0
object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 6, 0, 3, 12, 0, 0, 0, 0, 10, 0, BerryTreeScript, 0, 0, 0
object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 41, 0, 3, 12, 0, 0, 0, 0, 11, 0, BerryTreeScript, 0, 0, 0
object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 41, 0, 3, 12, 0, 0, 0, 0, 12, 0, BerryTreeScript, 0, 0, 0
object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 41, 0, 3, 12, 0, 0, 0, 0, 13, 0, BerryTreeScript, 0, 0, 0
object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 6, 0, 3, 12, 0, 0, 0, 0, 8, 0, S_BerryTree, 0, 0, 0
object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 6, 0, 3, 12, 0, 0, 0, 0, 9, 0, S_BerryTree, 0, 0, 0
object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 6, 0, 3, 12, 0, 0, 0, 0, 10, 0, S_BerryTree, 0, 0, 0
object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 41, 0, 3, 12, 0, 0, 0, 0, 11, 0, S_BerryTree, 0, 0, 0
object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 41, 0, 3, 12, 0, 0, 0, 0, 12, 0, S_BerryTree, 0, 0, 0
object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 41, 0, 3, 12, 0, 0, 0, 0, 13, 0, S_BerryTree, 0, 0, 0
object_event 16, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 37, 0, 8, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EEC8, 0, 0, 0
object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 22, 0, 3, 12, 0, 0, 0, 0, 3, 0, BerryTreeScript, 0, 0, 0
object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 23, 0, 3, 12, 0, 0, 0, 0, 4, 0, BerryTreeScript, 0, 0, 0
object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 24, 0, 3, 12, 0, 0, 0, 0, 75, 0, BerryTreeScript, 0, 0, 0
object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 25, 0, 3, 12, 0, 0, 0, 0, 76, 0, BerryTreeScript, 0, 0, 0
object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 22, 0, 3, 12, 0, 0, 0, 0, 3, 0, S_BerryTree, 0, 0, 0
object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 23, 0, 3, 12, 0, 0, 0, 0, 4, 0, S_BerryTree, 0, 0, 0
object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 24, 0, 3, 12, 0, 0, 0, 0, 75, 0, S_BerryTree, 0, 0, 0
object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 25, 0, 3, 12, 0, 0, 0, 0, 76, 0, S_BerryTree, 0, 0, 0
object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route104_EventScript_1B1453, 1002, 0, 0
object_event 22, MAP_OBJ_GFX_WOMAN_7, 0, 8, 0, 19, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route104_EventScript_14EF09, 906, 0, 0
object_event 23, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F25A, 0, 0, 0
@@ -28,7 +28,7 @@ Route104_MapObjects:: @ 8381488
object_event 27, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B1460, 1057, 0, 0
object_event 28, MAP_OBJ_GFX_YOUNGSTER, 0, 18, 0, 67, 0, 3, 46, 101, 0, 1, 0, 2, 0, Route104_EventScript_14F189, 0, 0, 0
object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B146D, 1115, 0, 0
object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0
object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
object_event 31, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B147A, 1135, 0, 0
object_event 32, MAP_OBJ_GFX_BOY_2, 0, 5, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF93, 0, 0, 0
data/maps/events/Route110.inc
+3 -3
View File
@@ -14,9 +14,9 @@ Route110_MapObjects:: @ 8381D58
object_event 13, MAP_OBJ_GFX_LASS, 0, 33, 0, 15, 0, 3, 9, 0, 0, 1, 0, 1, 0, Route110_EventScript_14FAA5, 0, 0, 0
object_event 14, MAP_OBJ_GFX_MANIAC, 0, 23, 0, 40, 0, 3, 20, 0, 0, 1, 0, 3, 0, Route110_EventScript_14FABC, 0, 0, 0
object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 10, 0, 19, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_EventScript_14FAFA, 0, 0, 0
object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 11, 0, 3, 12, 0, 0, 0, 0, 16, 0, BerryTreeScript, 0, 0, 0
object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 11, 0, 3, 12, 0, 0, 0, 0, 17, 0, BerryTreeScript, 0, 0, 0
object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 11, 0, 3, 12, 0, 0, 0, 0, 18, 0, BerryTreeScript, 0, 0, 0
object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 11, 0, 3, 12, 0, 0, 0, 0, 16, 0, S_BerryTree, 0, 0, 0
object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 11, 0, 3, 12, 0, 0, 0, 0, 17, 0, S_BerryTree, 0, 0, 0
object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 11, 0, 3, 12, 0, 0, 0, 0, 18, 0, S_BerryTree, 0, 0, 0
object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 69, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14BB, 1007, 0, 0
object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14AE, 1006, 0, 0
object_event 21, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 0, 92, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_EventScript_14FA53, 0, 0, 0
data/maps/events/Route110_TrickHousePuzzle1.inc
+15 -15
View File
@@ -2,22 +2,22 @@ Route110_TrickHousePuzzle1_MapObjects:: @ 839225C
object_event 1, MAP_OBJ_GFX_LASS, 0, 13, 0, 21, 0, 3, 9, 0, 0, 1, 0, 5, 0, Route110_TrickHousePuzzle1_EventScript_161D31, 0, 0, 0
object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 13, 0, 7, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle1_EventScript_161D48, 0, 0, 0
object_event 3, MAP_OBJ_GFX_LASS, 0, 3, 0, 8, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route110_TrickHousePuzzle1_EventScript_161D5F, 0, 0, 0
object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0
object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 7, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0
object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0
object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 10, 0, 16, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 20, 0, 0
object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 23, 0, 0
object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 22, 0, 0
object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 21, 0, 0
object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 25, 0, 0
object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 24, 0, 0
object_event 13, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 9, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 26, 0, 0
object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 28, 0, 0
object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 27, 0, 0
object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 29, 0, 0
object_event 17, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 11, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 30, 0, 0
object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0
object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 7, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0
object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 10, 0, 16, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 20, 0, 0
object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 23, 0, 0
object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 22, 0, 0
object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 21, 0, 0
object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 25, 0, 0
object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 24, 0, 0
object_event 13, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 9, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 26, 0, 0
object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 28, 0, 0
object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 27, 0, 0
object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 29, 0, 0
object_event 17, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 11, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 30, 0, 0
object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, 1060, 0, 0
object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 31, 0, 0
object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 31, 0, 0
Route110_TrickHousePuzzle1_MapWarps:: @ 8392424
warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance
data/maps/events/Route110_TrickHousePuzzle3.inc
+6 -6
View File
@@ -2,14 +2,14 @@ Route110_TrickHousePuzzle3_MapObjects:: @ 839254C
object_event 1, MAP_OBJ_GFX_CAMPER, 0, 10, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162708, 0, 0, 0
object_event 2, MAP_OBJ_GFX_PICNICKER, 0, 1, 0, 13, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_16271F, 0, 0, 0
object_event 3, MAP_OBJ_GFX_HIKER, 0, 11, 0, 4, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162736, 0, 0, 0
object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0
object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0
object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0
object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 20, 0, 0
object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0
object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0
object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0
object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0
object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, 1064, 0, 0
object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, 1063, 0, 0
object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0
object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 22, 0, 0
object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0
object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0
Route110_TrickHousePuzzle3_MapWarps:: @ 8392654
warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance
data/maps/events/Route110_TrickHousePuzzle4.inc
+11 -11
View File
@@ -3,17 +3,17 @@ Route110_TrickHousePuzzle4_MapObjects:: @ 83926FC
object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 4, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle4_EventScript_162799, 0, 0, 0
object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 7, 0, 4, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle4_EventScript_162782, 0, 0, 0
object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, 1065, 0, 0
object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0
object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0
object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0
object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0
object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0
object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0
object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0
object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 24, 0, 0
object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 25, 0, 0
object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 26, 0, 0
object_event 15, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 27, 0, 0
object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0
object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0
object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0
object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0
object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0
object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 24, 0, 0
object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 25, 0, 0
object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 26, 0, 0
object_event 15, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 27, 0, 0
Route110_TrickHousePuzzle4_MapWarps:: @ 8392864
warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance
data/maps/events/Route111.inc
+7 -7
View File
@@ -4,8 +4,8 @@ Route111_MapObjects:: @ 83821A0
object_event 3, MAP_OBJ_GFX_LASS, 0, 13, 0, 113, 0, 0, 8, 1, 0, 0, 0, 0, 0, 0x0, 770, 0, 0
object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 771, 0, 0
object_event 5, MAP_OBJ_GFX_PICNICKER, 0, 28, 0, 51, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503BE, 0, 0, 0
object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 5, 0, 3, 12, 0, 0, 0, 0, 19, 0, BerryTreeScript, 0, 0, 0
object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 5, 0, 3, 12, 0, 0, 0, 0, 20, 0, BerryTreeScript, 0, 0, 0
object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 5, 0, 3, 12, 0, 0, 0, 0, 19, 0, S_BerryTree, 0, 0, 0
object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 5, 0, 3, 12, 0, 0, 0, 0, 20, 0, S_BerryTree, 0, 0, 0
object_event 8, MAP_OBJ_GFX_MAN_4, 0, 8, 0, 91, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route111_EventScript_150395, 0, 0, 0
object_event 9, MAP_OBJ_GFX_CAMPER, 0, 24, 0, 60, 0, 3, 21, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503A7, 0, 0, 0
object_event 10, MAP_OBJ_GFX_HIKER, 0, 27, 0, 69, 0, 3, 50, 34, 0, 1, 0, 2, 0, Route111_EventScript_150403, 0, 0, 0
@@ -13,19 +13,19 @@ Route111_MapObjects:: @ 83821A0
object_event 12, MAP_OBJ_GFX_PICNICKER, 0, 32, 0, 72, 0, 3, 24, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503EC, 0, 0, 0
object_event 13, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE442, 796, 0, 0
object_event 14, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE422, 796, 0, 0
object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0
object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0
object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0
object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0
object_event 17, MAP_OBJ_GFX_GIRL_1, 0, 23, 0, 8, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route111_EventScript_1500C5, 0, 0, 0
object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 105, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14C8, 1008, 0, 0
object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 80, 0, BerryTreeScript, 0, 0, 0
object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 5, 0, 3, 12, 0, 0, 0, 0, 81, 0, BerryTreeScript, 0, 0, 0
object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 80, 0, S_BerryTree, 0, 0, 0
object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 5, 0, 3, 12, 0, 0, 0, 0, 81, 0, S_BerryTree, 0, 0, 0
object_event 21, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE4E2, 799, 0, 0
object_event 22, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE502, 799, 0, 0
object_event 23, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE562, 903, 0, 0
object_event 24, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE582, 903, 0, 0
object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 54, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14D5, 1009, 0, 0
object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 114, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14E2, 1010, 0, 0
object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0
object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0
object_event 28, MAP_OBJ_GFX_PICNICKER, 0, 10, 0, 82, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route111_EventScript_150458, 0, 0, 0
object_event 29, MAP_OBJ_GFX_CAMPER, 0, 11, 0, 71, 0, 3, 22, 0, 0, 1, 0, 3, 0, Route111_EventScript_150441, 0, 0, 0
object_event 30, MAP_OBJ_GFX_BLACK_BELT, 0, 32, 0, 29, 0, 3, 28, 1, 0, 1, 0, 2, 0, Route111_EventScript_15046F, 0, 0, 0
data/maps/events/Route112.inc
+4 -4
View File
@@ -5,10 +5,10 @@ Route112_MapObjects:: @ 8382818
object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 22, 0, 46, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route112_EventScript_1505B5, 0, 0, 0
object_event 5, MAP_OBJ_GFX_HIKER, 0, 17, 0, 40, 0, 3, 16, 0, 0, 1, 0, 4, 0, Route112_EventScript_150560, 0, 0, 0
object_event 6, 241, 0, 27, 0, 30, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_EventScript_15051C, 819, 0, 0
object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 27, 0, 6, 0, 0, 12, 0, 0, 0, 0, 24, 0, BerryTreeScript, 0, 0, 0
object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 28, 0, 6, 0, 0, 12, 0, 0, 0, 0, 23, 0, BerryTreeScript, 0, 0, 0
object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 6, 0, 0, 12, 0, 0, 0, 0, 22, 0, BerryTreeScript, 0, 0, 0
object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 6, 0, 3, 12, 0, 0, 0, 0, 21, 0, BerryTreeScript, 0, 0, 0
object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 27, 0, 6, 0, 0, 12, 0, 0, 0, 0, 24, 0, S_BerryTree, 0, 0, 0
object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 28, 0, 6, 0, 0, 12, 0, 0, 0, 0, 23, 0, S_BerryTree, 0, 0, 0
object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 6, 0, 0, 12, 0, 0, 0, 0, 22, 0, S_BerryTree, 0, 0, 0
object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 6, 0, 3, 12, 0, 0, 0, 0, 21, 0, S_BerryTree, 0, 0, 0
object_event 11, MAP_OBJ_GFX_HIKER, 0, 8, 0, 50, 0, 3, 26, 48, 0, 0, 0, 0, 0, Route112_EventScript_150540, 0, 0, 0
object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 43, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route112_EventScript_1B14EF, 1011, 0, 0
data/maps/events/Route114.inc
+8 -8
View File
@@ -1,25 +1,25 @@
Route114_MapObjects:: @ 8382C48
object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 43, 0, 3, 12, 0, 0, 0, 0, 77, 0, BerryTreeScript, 0, 0, 0
object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 44, 0, 3, 12, 0, 0, 0, 0, 78, 0, BerryTreeScript, 0, 0, 0
object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 43, 0, 3, 12, 0, 0, 0, 0, 77, 0, S_BerryTree, 0, 0, 0
object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 44, 0, 3, 12, 0, 0, 0, 0, 78, 0, S_BerryTree, 0, 0, 0
object_event 3, MAP_OBJ_GFX_HIKER, 0, 15, 0, 65, 0, 7, 10, 0, 0, 1, 0, 6, 0, Route114_EventScript_1507F1, 0, 0, 0
object_event 4, MAP_OBJ_GFX_HIKER, 0, 30, 0, 72, 0, 5, 15, 0, 0, 1, 0, 4, 0, Route114_EventScript_150808, 0, 0, 0
object_event 5, MAP_OBJ_GFX_CAMPER, 0, 22, 0, 50, 0, 3, 10, 0, 0, 1, 0, 3, 0, Route114_EventScript_15081F, 0, 0, 0
object_event 6, MAP_OBJ_GFX_PICNICKER, 0, 19, 0, 35, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route114_EventScript_150836, 0, 0, 0
object_event 7, MAP_OBJ_GFX_MANIAC, 0, 20, 0, 56, 0, 3, 7, 0, 0, 1, 0, 3, 0, Route114_EventScript_15084D, 0, 0, 0
object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 45, 0, 3, 12, 0, 0, 0, 0, 68, 0, BerryTreeScript, 0, 0, 0
object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 45, 0, 3, 12, 0, 0, 0, 0, 68, 0, S_BerryTree, 0, 0, 0
object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1516, 1014, 0, 0
object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 37, 0, 4, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1523, 1015, 0, 0
object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 0, 43, 0, 4, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0
object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 0, 43, 0, 4, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0
object_event 12, MAP_OBJ_GFX_GENTLEMAN, 0, 19, 0, 11, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_150782, 0, 0, 0
object_event 13, MAP_OBJ_GFX_POOCHYENA, 0, 19, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_1507C3, 0, 0, 0
object_event 14, MAP_OBJ_GFX_MAN_5, 0, 27, 0, 42, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route114_EventScript_150733, 0, 0, 0
object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 23, 0, 20, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508E0, 0, 0, 0
object_event 16, MAP_OBJ_GFX_FISHERMAN, 0, 19, 0, 26, 0, 3, 9, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508C9, 0, 0, 0
object_event 17, MAP_OBJ_GFX_MAN_6, 0, 30, 0, 58, 0, 5, 23, 0, 0, 1, 0, 3, 0, Route114_EventScript_15088B, 0, 0, 0
object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 53, 0, 5, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0
object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 0, 54, 0, 5, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0
object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 0, 69, 0, 7, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 20, 0, 0
object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 64, 0, 5, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0
object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 53, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0
object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 0, 54, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0
object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 0, 69, 0, 7, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0
object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 64, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0
object_event 22, MAP_OBJ_GFX_LASS, 0, 24, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_150912, 0, 0, 0
object_event 23, MAP_OBJ_GFX_LASS, 0, 23, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_1508F7, 0, 0, 0
data/maps/events/Route115.inc
+6 -6
View File
@@ -2,18 +2,18 @@ Route115_MapObjects:: @ 8382F2C
object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 18, 0, 68, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route115_EventScript_15092E, 0, 0, 0
object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 15, 0, 3, 10, 0, 0, 1, 0, 6, 0, Route115_EventScript_150949, 0, 0, 0
object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 27, 0, 53, 0, 3, 15, 17, 0, 1, 0, 4, 0, Route115_EventScript_15099E, 0, 0, 0
object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 69, 0, BerryTreeScript, 0, 0, 0
object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 70, 0, BerryTreeScript, 0, 0, 0
object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 13, 0, 5, 0, 3, 12, 0, 0, 0, 0, 71, 0, BerryTreeScript, 0, 0, 0
object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 69, 0, S_BerryTree, 0, 0, 0
object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 70, 0, S_BerryTree, 0, 0, 0
object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 13, 0, 5, 0, 3, 12, 0, 0, 0, 0, 71, 0, S_BerryTree, 0, 0, 0
object_event 7, MAP_OBJ_GFX_GIRL_3, 0, 15, 0, 50, 0, 3, 64, 0, 0, 1, 0, 3, 0, Route115_EventScript_1509DC, 0, 0, 0
object_event 8, MAP_OBJ_GFX_BLACK_BELT, 0, 17, 0, 17, 0, 3, 50, 51, 0, 1, 0, 2, 0, Route115_EventScript_150987, 0, 0, 0
object_event 9, MAP_OBJ_GFX_MANIAC, 0, 25, 0, 61, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route115_EventScript_150A1A, 0, 0, 0
object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 60, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B1530, 1016, 0, 0
object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B153D, 1017, 0, 0
object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B154A, 1018, 0, 0
object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 64, 0, 3, 12, 0, 0, 0, 0, 55, 0, BerryTreeScript, 0, 0, 0
object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 65, 0, 3, 12, 0, 0, 0, 0, 56, 0, BerryTreeScript, 0, 0, 0
object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0
object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 64, 0, 3, 12, 0, 0, 0, 0, 55, 0, S_BerryTree, 0, 0, 0
object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 65, 0, 3, 12, 0, 0, 0, 0, 56, 0, S_BerryTree, 0, 0, 0
object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0
object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route115_EventScript_1B1557, 1118, 0, 0
Route115_MapWarps:: @ 83830AC
data/maps/events/Route116.inc
+8 -8
View File
@@ -1,18 +1,18 @@
Route116_MapObjects:: @ 8383170
object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 2, 0, 3, 12, 0, 0, 0, 0, 25, 0, BerryTreeScript, 0, 0, 0
object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 2, 0, 3, 12, 0, 0, 0, 0, 26, 0, BerryTreeScript, 0, 0, 0
object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 2, 0, 3, 12, 0, 0, 0, 0, 25, 0, S_BerryTree, 0, 0, 0
object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 2, 0, 3, 12, 0, 0, 0, 0, 26, 0, S_BerryTree, 0, 0, 0
object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 12, 0, 7, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route116_EventScript_150C62, 0, 0, 0
object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 21, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0
object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 33, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0
object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 21, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 33, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0
object_event 6, MAP_OBJ_GFX_BUG_CATCHER, 0, 13, 0, 17, 0, 3, 24, 0, 0, 1, 0, 2, 0, Route116_EventScript_150C79, 0, 0, 0
object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B1571, 1019, 0, 0
object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B157E, 1020, 0, 0
object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 20, 0, 2, 0, 3, 12, 0, 0, 0, 0, 66, 0, BerryTreeScript, 0, 0, 0
object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 21, 0, 2, 0, 3, 12, 0, 0, 0, 0, 67, 0, BerryTreeScript, 0, 0, 0
object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 20, 0, 2, 0, 3, 12, 0, 0, 0, 0, 66, 0, S_BerryTree, 0, 0, 0
object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 21, 0, 2, 0, 3, 12, 0, 0, 0, 0, 67, 0, S_BerryTree, 0, 0, 0
object_event 11, MAP_OBJ_GFX_OLD_MAN_1, 0, 46, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_150B5D, 891, 0, 0
object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0
object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0
object_event 13, MAP_OBJ_GFX_HIKER, 0, 36, 0, 15, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CCE, 0, 0, 0
object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 24, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 20, 0, 0
object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 24, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 20, 0, 0
object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 80, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B158B, 1021, 0, 0
object_event 16, MAP_OBJ_GFX_LASS, 0, 22, 0, 16, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route116_EventScript_150CE5, 0, 0, 0
object_event 17, MAP_OBJ_GFX_GIRL_3, 0, 25, 0, 4, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CFC, 0, 0, 0
data/maps/events/Route117.inc
+4 -4
View File
@@ -9,11 +9,11 @@ Route117_MapObjects:: @ 8383440
object_event 8, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 35, 0, 7, 0, 3, 28, 7, 0, 1, 0, 4, 0, Route117_EventScript_150E09, 0, 0, 0
object_event 9, MAP_OBJ_GFX_WOMAN_3, 0, 31, 0, 11, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route117_EventScript_150DCB, 0, 0, 0
object_event 10, MAP_OBJ_GFX_MAN_5, 0, 10, 0, 9, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route117_EventScript_150D8D, 0, 0, 0
object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 41, 0, 13, 0, 3, 12, 0, 0, 0, 0, 29, 0, BerryTreeScript, 0, 0, 0
object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 42, 0, 13, 0, 3, 12, 0, 0, 0, 0, 28, 0, BerryTreeScript, 0, 0, 0
object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 43, 0, 13, 0, 3, 12, 0, 0, 0, 0, 27, 0, BerryTreeScript, 0, 0, 0
object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 41, 0, 13, 0, 3, 12, 0, 0, 0, 0, 29, 0, S_BerryTree, 0, 0, 0
object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 42, 0, 13, 0, 3, 12, 0, 0, 0, 0, 28, 0, S_BerryTree, 0, 0, 0
object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 43, 0, 13, 0, 3, 12, 0, 0, 0, 0, 27, 0, S_BerryTree, 0, 0, 0
object_event 14, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B1598, 1022, 0, 0
object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0
object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B15A5, 1023, 0, 0
object_event 17, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 21, 0, 1, 0, 3, 40, 68, 0, 1, 0, 3, 0, Route117_EventScript_150E47, 0, 0, 0
object_event 18, MAP_OBJ_GFX_MANIAC, 0, 17, 0, 12, 0, 3, 7, 17, 0, 1, 0, 4, 0, Route117_EventScript_150E85, 0, 0, 0
data/maps/events/Route118.inc
+4 -4
View File
@@ -1,7 +1,7 @@
Route118_MapObjects:: @ 8383684
object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 5, 0, 3, 12, 0, 0, 0, 0, 31, 0, BerryTreeScript, 0, 0, 0
object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 5, 0, 3, 12, 0, 0, 0, 0, 32, 0, BerryTreeScript, 0, 0, 0
object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 37, 0, 5, 0, 3, 12, 0, 0, 0, 0, 33, 0, BerryTreeScript, 0, 0, 0
object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 5, 0, 3, 12, 0, 0, 0, 0, 31, 0, S_BerryTree, 0, 0, 0
object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 5, 0, 3, 12, 0, 0, 0, 0, 32, 0, S_BerryTree, 0, 0, 0
object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 37, 0, 5, 0, 3, 12, 0, 0, 0, 0, 33, 0, S_BerryTree, 0, 0, 0
object_event 4, MAP_OBJ_GFX_MAN_6, 0, 64, 0, 10, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route118_EventScript_151139, 0, 0, 0
object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE462, 797, 0, 0
object_event 6, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE482, 797, 0, 0
@@ -10,7 +10,7 @@ Route118_MapObjects:: @ 8383684
object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE542, 901, 0, 0
object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE562, 904, 0, 0
object_event 11, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE582, 904, 0, 0
object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0
object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 28, 0, 8, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route118_EventScript_150F34, 0, 0, 0
object_event 14, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 10, 0, 3, 24, 0, 0, 1, 0, 4, 0, Route118_EventScript_15108F, 0, 0, 0
object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 14, 0, 14, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route118_EventScript_1510E4, 0, 0, 0
data/maps/events/Route119.inc
+7 -7
View File
@@ -1,7 +1,7 @@
Route119_MapObjects:: @ 8383914
object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 5, 0, 3, 12, 0, 0, 0, 0, 34, 0, BerryTreeScript, 0, 0, 0
object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 5, 0, 3, 12, 0, 0, 0, 0, 35, 0, BerryTreeScript, 0, 0, 0
object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 26, 0, 5, 0, 3, 12, 0, 0, 0, 0, 36, 0, BerryTreeScript, 0, 0, 0
object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 5, 0, 3, 12, 0, 0, 0, 0, 34, 0, S_BerryTree, 0, 0, 0
object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 5, 0, 3, 12, 0, 0, 0, 0, 35, 0, S_BerryTree, 0, 0, 0
object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 26, 0, 5, 0, 3, 12, 0, 0, 0, 0, 36, 0, S_BerryTree, 0, 0, 0
object_event 4, MAP_OBJ_GFX_BUG_CATCHER, 0, 12, 0, 123, 0, 3, 59, 0, 0, 1, 0, 1, 0, Route119_EventScript_151491, 0, 0, 0
object_event 5, MAP_OBJ_GFX_MANIAC, 0, 26, 0, 123, 0, 3, 60, 0, 0, 1, 0, 1, 0, Route119_EventScript_151463, 0, 0, 0
object_event 6, MAP_OBJ_GFX_MANIAC, 0, 5, 0, 125, 0, 3, 62, 0, 0, 1, 0, 1, 0, Route119_EventScript_15144C, 0, 0, 0
@@ -25,10 +25,10 @@ Route119_MapObjects:: @ 8383914
object_event 24, 241, 0, 13, 0, 34, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515DC, 890, 0, 0
object_event 25, 243, 0, 17, 0, 33, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0x0, 923, 0, 0
object_event 26, MAP_OBJ_GFX_BOY_3, 0, 31, 0, 109, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515F3, 0, 0, 0
object_event 27, MAP_OBJ_GFX_BERRY_TREE, 0, 8, 0, 23, 0, 3, 12, 0, 0, 0, 0, 83, 0, BerryTreeScript, 0, 0, 0
object_event 28, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 23, 0, 3, 12, 0, 0, 0, 0, 84, 0, BerryTreeScript, 0, 0, 0
object_event 29, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 90, 0, 3, 12, 0, 0, 0, 0, 85, 0, BerryTreeScript, 0, 0, 0
object_event 30, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 90, 0, 3, 12, 0, 0, 0, 0, 86, 0, BerryTreeScript, 0, 0, 0
object_event 27, MAP_OBJ_GFX_BERRY_TREE, 0, 8, 0, 23, 0, 3, 12, 0, 0, 0, 0, 83, 0, S_BerryTree, 0, 0, 0
object_event 28, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 23, 0, 3, 12, 0, 0, 0, 0, 84, 0, S_BerryTree, 0, 0, 0
object_event 29, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 90, 0, 3, 12, 0, 0, 0, 0, 85, 0, S_BerryTree, 0, 0, 0
object_event 30, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 90, 0, 3, 12, 0, 0, 0, 0, 86, 0, S_BerryTree, 0, 0, 0
object_event 31, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 0, 133, 0, 3, 5, 18, 0, 0, 0, 0, 0, Route119_EventScript_15141A, 0, 0, 0
object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route119_EventScript_1B160D, 1106, 0, 0
object_event 33, MAP_OBJ_GFX_BOY_2, 0, 35, 0, 93, 0, 4, 2, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515FC, 0, 0, 0
data/maps/events/Route120.inc
+13 -13
View File
@@ -1,14 +1,14 @@
Route120_MapObjects:: @ 8383F30
object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 4, 0, 79, 0, 3, 12, 0, 0, 0, 0, 46, 0, BerryTreeScript, 0, 0, 0
object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 79, 0, 3, 12, 0, 0, 0, 0, 45, 0, BerryTreeScript, 0, 0, 0
object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 79, 0, 3, 12, 0, 0, 0, 0, 44, 0, BerryTreeScript, 0, 0, 0
object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 79, 0, 3, 12, 0, 0, 0, 0, 43, 0, BerryTreeScript, 0, 0, 0
object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 24, 0, 3, 12, 0, 0, 0, 0, 37, 0, BerryTreeScript, 0, 0, 0
object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 24, 0, 3, 12, 0, 0, 0, 0, 38, 0, BerryTreeScript, 0, 0, 0
object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 24, 0, 3, 12, 0, 0, 0, 0, 39, 0, BerryTreeScript, 0, 0, 0
object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 92, 0, 5, 12, 0, 0, 0, 0, 40, 0, BerryTreeScript, 0, 0, 0
object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 10, 0, 92, 0, 5, 12, 0, 0, 0, 0, 41, 0, BerryTreeScript, 0, 0, 0
object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 92, 0, 5, 12, 0, 0, 0, 0, 42, 0, BerryTreeScript, 0, 0, 0
object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 4, 0, 79, 0, 3, 12, 0, 0, 0, 0, 46, 0, S_BerryTree, 0, 0, 0
object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 79, 0, 3, 12, 0, 0, 0, 0, 45, 0, S_BerryTree, 0, 0, 0
object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 79, 0, 3, 12, 0, 0, 0, 0, 44, 0, S_BerryTree, 0, 0, 0
object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 79, 0, 3, 12, 0, 0, 0, 0, 43, 0, S_BerryTree, 0, 0, 0
object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 24, 0, 3, 12, 0, 0, 0, 0, 37, 0, S_BerryTree, 0, 0, 0
object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 24, 0, 3, 12, 0, 0, 0, 0, 38, 0, S_BerryTree, 0, 0, 0
object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 24, 0, 3, 12, 0, 0, 0, 0, 39, 0, S_BerryTree, 0, 0, 0
object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 92, 0, 5, 12, 0, 0, 0, 0, 40, 0, S_BerryTree, 0, 0, 0
object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 10, 0, 92, 0, 5, 12, 0, 0, 0, 0, 41, 0, S_BerryTree, 0, 0, 0
object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 92, 0, 5, 12, 0, 0, 0, 0, 42, 0, S_BerryTree, 0, 0, 0
object_event 11, MAP_OBJ_GFX_MAN_6, 0, 5, 0, 22, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route120_EventScript_1519B3, 0, 0, 0
object_event 12, MAP_OBJ_GFX_MAN_6, 0, 32, 0, 14, 0, 3, 10, 0, 0, 1, 0, 3, 0, Route120_EventScript_1519CA, 0, 0, 0
object_event 13, MAP_OBJ_GFX_CAMPER, 0, 27, 0, 51, 0, 3, 9, 0, 0, 1, 0, 7, 0, Route120_EventScript_151A08, 0, 0, 0
@@ -19,7 +19,7 @@ Route120_MapObjects:: @ 8383F30
object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4A2, 798, 0, 0
object_event 19, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE562, 902, 0, 0
object_event 20, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE582, 902, 0, 0
object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0
object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 89, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B1627, 1031, 0, 0
object_event 23, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 92, 0, 5, 5, 1, 0, 0, 0, 0, 0, Route120_EventScript_151739, 0, 0, 0
object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 28, 0, 35, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route120_EventScript_151A74, 0, 0, 0
@@ -30,8 +30,8 @@ Route120_MapObjects:: @ 8383F30
object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 82, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1634, 1107, 0, 0
object_event 30, MAP_OBJ_GFX_KECLEON_1, 0, 12, 0, 16, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_151998, 970, 0, 0
object_event 31, MAP_OBJ_GFX_STEVEN, 0, 13, 0, 15, 0, 4, 8, 17, 0, 0, 0, 0, 0, Route120_EventScript_151853, 972, 0, 0
object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 20, 0, 0
object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0
object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 20, 0, 0
object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0
object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 10, 0, 72, 0, 3, 58, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AD0, 0, 0, 0
object_event 35, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 19, 0, 28, 0, 3, 57, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AE7, 0, 0, 0
object_event 36, MAP_OBJ_GFX_KECLEON_2, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 981, 0, 0
data/maps/events/Route121.inc
+11 -11
View File
@@ -1,26 +1,26 @@
Route121_MapObjects:: @ 8384504
object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 29, 0, 14, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route121_EventScript_151B0A, 0, 0, 0
object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 2, 0, 3, 12, 0, 0, 0, 0, 47, 0, BerryTreeScript, 0, 0, 0
object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 2, 0, 3, 12, 0, 0, 0, 0, 48, 0, BerryTreeScript, 0, 0, 0
object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 16, 0, 2, 0, 3, 12, 0, 0, 0, 0, 49, 0, BerryTreeScript, 0, 0, 0
object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 2, 0, 3, 12, 0, 0, 0, 0, 50, 0, BerryTreeScript, 0, 0, 0
object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 64, 0, 14, 0, 3, 12, 0, 0, 0, 0, 51, 0, BerryTreeScript, 0, 0, 0
object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 65, 0, 14, 0, 3, 12, 0, 0, 0, 0, 52, 0, BerryTreeScript, 0, 0, 0
object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 66, 0, 14, 0, 3, 12, 0, 0, 0, 0, 53, 0, BerryTreeScript, 0, 0, 0
object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 67, 0, 14, 0, 3, 12, 0, 0, 0, 0, 54, 0, BerryTreeScript, 0, 0, 0
object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 2, 0, 3, 12, 0, 0, 0, 0, 47, 0, S_BerryTree, 0, 0, 0
object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 2, 0, 3, 12, 0, 0, 0, 0, 48, 0, S_BerryTree, 0, 0, 0
object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 16, 0, 2, 0, 3, 12, 0, 0, 0, 0, 49, 0, S_BerryTree, 0, 0, 0
object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 2, 0, 3, 12, 0, 0, 0, 0, 50, 0, S_BerryTree, 0, 0, 0
object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 64, 0, 14, 0, 3, 12, 0, 0, 0, 0, 51, 0, S_BerryTree, 0, 0, 0
object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 65, 0, 14, 0, 3, 12, 0, 0, 0, 0, 52, 0, S_BerryTree, 0, 0, 0
object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 66, 0, 14, 0, 3, 12, 0, 0, 0, 0, 53, 0, S_BerryTree, 0, 0, 0
object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 67, 0, 14, 0, 3, 12, 0, 0, 0, 0, 54, 0, S_BerryTree, 0, 0, 0
object_event 10, MAP_OBJ_GFX_LASS, 0, 39, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BDE, 0, 0, 0
object_event 11, MAP_OBJ_GFX_LASS, 0, 40, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BF9, 0, 0, 0
object_event 12, 241, 0, 30, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0
object_event 13, 241, 0, 30, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0
object_event 14, 241, 0, 31, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0
object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0
object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0
object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0
object_event 17, MAP_OBJ_GFX_WOMAN_2, 0, 63, 0, 5, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route121_EventScript_151B72, 0, 0, 0
object_event 18, MAP_OBJ_GFX_GENTLEMAN, 0, 55, 0, 8, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route121_EventScript_151B89, 0, 0, 0
object_event 19, MAP_OBJ_GFX_HEX_MANIAC, 0, 11, 0, 10, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route121_EventScript_151BC7, 0, 0, 0
object_event 20, MAP_OBJ_GFX_BEAUTY, 0, 22, 0, 5, 0, 3, 17, 0, 0, 1, 0, 4, 0, Route121_EventScript_151C14, 0, 0, 0
object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 55, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route121_EventScript_1B164E, 1103, 0, 0
object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0
object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0
Route121_MapWarps:: @ 8384714
warp_def 37, 5, 0, 2, Route121_SafariZoneEntrance
data/maps/events/Route123.inc
+21 -21
View File
@@ -1,30 +1,30 @@
Route123_MapObjects:: @ 83847F8
object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 3, 0, 3, 12, 0, 0, 0, 0, 58, 0, BerryTreeScript, 0, 0, 0
object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 3, 0, 3, 12, 0, 0, 0, 0, 59, 0, BerryTreeScript, 0, 0, 0
object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 3, 0, 3, 12, 0, 0, 0, 0, 60, 0, BerryTreeScript, 0, 0, 0
object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 3, 0, 3, 12, 0, 0, 0, 0, 61, 0, BerryTreeScript, 0, 0, 0
object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 81, 0, 1, 0, 3, 12, 0, 0, 0, 0, 62, 0, BerryTreeScript, 0, 0, 0
object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 82, 0, 1, 0, 3, 12, 0, 0, 0, 0, 63, 0, BerryTreeScript, 0, 0, 0
object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 83, 0, 1, 0, 3, 12, 0, 0, 0, 0, 64, 0, BerryTreeScript, 0, 0, 0
object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 3, 0, 3, 12, 0, 0, 0, 0, 58, 0, S_BerryTree, 0, 0, 0
object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 3, 0, 3, 12, 0, 0, 0, 0, 59, 0, S_BerryTree, 0, 0, 0
object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 3, 0, 3, 12, 0, 0, 0, 0, 60, 0, S_BerryTree, 0, 0, 0
object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 3, 0, 3, 12, 0, 0, 0, 0, 61, 0, S_BerryTree, 0, 0, 0
object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 81, 0, 1, 0, 3, 12, 0, 0, 0, 0, 62, 0, S_BerryTree, 0, 0, 0
object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 82, 0, 1, 0, 3, 12, 0, 0, 0, 0, 63, 0, S_BerryTree, 0, 0, 0
object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 83, 0, 1, 0, 3, 12, 0, 0, 0, 0, 64, 0, S_BerryTree, 0, 0, 0
object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 70, 0, 12, 0, 3, 24, 0, 0, 1, 0, 1, 0, Route123_EventScript_151CD1, 0, 0, 0
object_event 9, MAP_OBJ_GFX_MAN_4, 0, 58, 0, 7, 0, 3, 17, 0, 0, 1, 0, 2, 0, Route123_EventScript_151CE8, 0, 0, 0
object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 5, 0, 3, 12, 0, 0, 0, 0, 65, 0, BerryTreeScript, 0, 0, 0
object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 5, 0, 3, 12, 0, 0, 0, 0, 72, 0, BerryTreeScript, 0, 0, 0
object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 5, 0, 3, 12, 0, 0, 0, 0, 73, 0, BerryTreeScript, 0, 0, 0
object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 74, 0, BerryTreeScript, 0, 0, 0
object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 3, 0, 3, 12, 0, 0, 0, 0, 79, 0, BerryTreeScript, 0, 0, 0
object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 3, 0, 3, 12, 0, 0, 0, 0, 14, 0, BerryTreeScript, 0, 0, 0
object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 15, 0, BerryTreeScript, 0, 0, 0
object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 30, 0, BerryTreeScript, 0, 0, 0
object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 101, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0
object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 129, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0
object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 92, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0
object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 5, 0, 3, 12, 0, 0, 0, 0, 65, 0, S_BerryTree, 0, 0, 0
object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 5, 0, 3, 12, 0, 0, 0, 0, 72, 0, S_BerryTree, 0, 0, 0
object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 5, 0, 3, 12, 0, 0, 0, 0, 73, 0, S_BerryTree, 0, 0, 0
object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 74, 0, S_BerryTree, 0, 0, 0
object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 3, 0, 3, 12, 0, 0, 0, 0, 79, 0, S_BerryTree, 0, 0, 0
object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 3, 0, 3, 12, 0, 0, 0, 0, 14, 0, S_BerryTree, 0, 0, 0
object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 15, 0, S_BerryTree, 0, 0, 0
object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 30, 0, S_BerryTree, 0, 0, 0
object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 101, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 129, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0
object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 92, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0
object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B165B, 1032, 0, 0
object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 139, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B1668, 1033, 0, 0
object_event 23, MAP_OBJ_GFX_GIRL_3, 0, 108, 0, 13, 0, 3, 15, 0, 0, 0, 0, 0, 0, Route123_EventScript_151C5D, 0, 0, 0
object_event 24, MAP_OBJ_GFX_BERRY_TREE, 0, 109, 0, 13, 0, 3, 12, 0, 0, 0, 0, 87, 0, BerryTreeScript, 0, 0, 0
object_event 25, MAP_OBJ_GFX_BERRY_TREE, 0, 110, 0, 13, 0, 3, 12, 0, 0, 0, 0, 88, 0, BerryTreeScript, 0, 0, 0
object_event 26, MAP_OBJ_GFX_BERRY_TREE, 0, 111, 0, 13, 0, 3, 12, 0, 0, 0, 0, 89, 0, BerryTreeScript, 0, 0, 0
object_event 24, MAP_OBJ_GFX_BERRY_TREE, 0, 109, 0, 13, 0, 3, 12, 0, 0, 0, 0, 87, 0, S_BerryTree, 0, 0, 0
object_event 25, MAP_OBJ_GFX_BERRY_TREE, 0, 110, 0, 13, 0, 3, 12, 0, 0, 0, 0, 88, 0, S_BerryTree, 0, 0, 0
object_event 26, MAP_OBJ_GFX_BERRY_TREE, 0, 111, 0, 13, 0, 3, 12, 0, 0, 0, 0, 89, 0, S_BerryTree, 0, 0, 0
object_event 27, MAP_OBJ_GFX_WOMAN_3, 0, 16, 0, 9, 0, 3, 23, 0, 0, 1, 0, 2, 0, Route123_EventScript_151CFF, 0, 0, 0
object_event 28, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route123_EventScript_151DAD, 0, 0, 0
object_event 29, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route123_EventScript_151D92, 0, 0, 0
data/maps/events/Route130.inc
+1 -1
View File
@@ -1,7 +1,7 @@
Route130_MapObjects:: @ 838523C
object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 7, 0, 26, 0, 1, 29, 99, 0, 1, 0, 3, 0, Route130_EventScript_152410, 0, 0, 0
object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 68, 0, 22, 0, 1, 13, 17, 0, 1, 0, 3, 0, Route130_EventScript_152427, 0, 0, 0
object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 52, 0, 9, 0, 3, 12, 0, 0, 0, 0, 82, 0, BerryTreeScript, 17, 0, 0
object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 52, 0, 9, 0, 3, 12, 0, 0, 0, 0, 82, 0, S_BerryTree, 17, 0, 0
Route130_MapEvents:: @ 8385284
map_events Route130_MapObjects, 0x0, 0x0, 0x0
data/maps/events/RusturfTunnel.inc
+2 -2
View File
@@ -1,12 +1,12 @@
RusturfTunnel_MapObjects:: @ 838BD2C
object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 23, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, 807, 0, 0
object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 931, 0, 0
object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 931, 0, 0
object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, 1048, 0, 0
object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, 1049, 0, 0
object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 879, 0, 0
object_event 6, 241, 0, 14, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, 878, 0, 0
object_event 7, MAP_OBJ_GFX_WINGULL, 0, 14, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, 880, 0, 0
object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, BreakableRockScript, 932, 0, 0
object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, S_BreakableRock, 932, 0, 0
object_event 9, MAP_OBJ_GFX_HIKER, 0, 32, 0, 13, 0, 3, 9, 17, 0, 1, 0, 3, 0, RusturfTunnel_EventScript_15CACD, 0, 0, 0
object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 25, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C782, 983, 0, 0
data/maps/events/SafariZone_Northeast.inc
+6 -6
View File
@@ -1,12 +1,12 @@
SafariZone_Northeast_MapObjects:: @ 8391A2C
object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 22, 0, 9, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_160011, 0, 0, 0
object_event 2, MAP_OBJ_GFX_MAN_5, 0, 6, 0, 29, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_16001A, 0, 0, 0
object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0
object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0
object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0
object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 20, 0, 0
object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0
object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 22, 0, 0
object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0
object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0
object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0
object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0
object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0
object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0
object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B1919, 1119, 0, 0
SafariZone_Northeast_MapEvents:: @ 8391B04
data/maps/events/SeafloorCavern_Room1.inc
+3 -3
View File
@@ -1,7 +1,7 @@
SeafloorCavern_Room1_MapObjects:: @ 838D0B8
object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0
object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0
object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0
object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0
object_event 4, 241, 0, 8, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, SeafloorCavern_Room1_EventScript_15DA6D, 946, 0, 0
object_event 5, 241, 0, 15, 0, 10, 0, 3, 16, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room1_EventScript_15DA84, 946, 0, 0
data/maps/events/SeafloorCavern_Room2.inc
+9 -9
View File
@@ -1,13 +1,13 @@
SeafloorCavern_Room2_MapObjects:: @ 838D15C
object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0
object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0
object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0
object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0
object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0
object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0
object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 24, 0, 0
object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 25, 0, 0
object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0
object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0
object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0
object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0
object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0
object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 24, 0, 0
object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 25, 0, 0
object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0
SeafloorCavern_Room2_MapWarps:: @ 838D234
warp_def 12, 19, 3, 2, SeafloorCavern_Room1
data/maps/events/SeafloorCavern_Room3.inc
+9 -9
View File
@@ -1,13 +1,13 @@
SeafloorCavern_Room3_MapObjects:: @ 838D268
object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0
object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0
object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0
object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0
object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0
object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0
object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0
object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 24, 0, 0
object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 25, 0, 0
object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0
object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0
object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0
object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0
object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0
object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 24, 0, 0
object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 25, 0, 0
object_event 10, 242, 0, 10, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room3_EventScript_15DAA8, 946, 0, 0
SeafloorCavern_Room3_MapWarps:: @ 838D358
data/maps/events/SeafloorCavern_Room5.inc
+6 -6
View File
@@ -1,10 +1,10 @@
SeafloorCavern_Room5_MapObjects:: @ 838D3D0
object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0
object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0
object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0
object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0
object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 22, 0, 0
object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0
object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0
object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0
object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0
object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0
SeafloorCavern_Room5_MapWarps:: @ 838D460
warp_def 4, 1, 3, 1, SeafloorCavern_Room1
data/maps/events/SeafloorCavern_Room8.inc
+12 -12
View File
@@ -1,16 +1,16 @@
SeafloorCavern_Room8_MapObjects:: @ 838D4DC
object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0
object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0
object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0
object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0
object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0
object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0
object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0
object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 24, 0, 0
object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 25, 0, 0
object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 26, 0, 0
object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 27, 0, 0
object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 28, 0, 0
object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0
object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0
object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0
object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0
object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0
object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 24, 0, 0
object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 25, 0, 0
object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 26, 0, 0
object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 27, 0, 0
object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 28, 0, 0
SeafloorCavern_Room8_MapWarps:: @ 838D5FC
warp_def 5, 2, 3, 0, SeafloorCavern_Room9
data/maps/events/ShoalCave_LowTideLowerRoom.inc
+1 -1
View File
@@ -1,5 +1,5 @@
ShoalCave_LowTideLowerRoom_MapObjects:: @ 838DE3C
object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0
object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 11, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E44F, 0, 0, 0
ShoalCave_LowTideLowerRoom_MapWarps:: @ 838DE6C
data/maps/events/VictoryRoad_B1F.inc
+14 -14
View File
@@ -1,21 +1,21 @@
VictoryRoad_B1F_MapObjects:: @ 838DA04
object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0
object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0
object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0
object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0
object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0
object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0
object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 30, 0, 0
object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 25, 0, 0
object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 26, 0, 0
object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 27, 0, 0
object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 28, 0, 0
object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 29, 0, 0
object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 31, 0, 0
object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0
object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0
object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0
object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0
object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 30, 0, 0
object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 25, 0, 0
object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 26, 0, 0
object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 27, 0, 0
object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 28, 0, 0
object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 29, 0, 0
object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 31, 0, 0
object_event 14, MAP_OBJ_GFX_MAN_4, 0, 37, 0, 12, 0, 3, 9, 0, 0, 1, 0, 3, 0, VictoryRoad_B1F_EventScript_15DFB5, 0, 0, 0
object_event 15, MAP_OBJ_GFX_WOMAN_7, 0, 26, 0, 16, 0, 3, 7, 0, 0, 1, 0, 4, 0, VictoryRoad_B1F_EventScript_15DFCC, 0, 0, 0
object_event 16, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 21, 0, 3, 9, 0, 0, 1, 0, 2, 0, VictoryRoad_B1F_EventScript_15DFE3, 0, 0, 0
object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 32, 0, 0
object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 32, 0, 0
object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 42, 0, 8, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, 1086, 0, 0
object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, 1087, 0, 0
data/mauville_old_man.s
-101
View File
@@ -1,101 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 1
gUnknown_083E537C:: @ 83E537C
.ifdef ENGLISH
ec_word SISTER
ec_word EATS
ec_word SWEETS
ec_word VORACIOUS
ec_word AND
ec_word DROOLING
.else
ec_word SISTER
ec_word MUST_BE
ec_word SWEETS
ec_word VORACIOUS
ec_word DROOLING
ec_word THICK
.endif
.align 2
gUnknown_083E5388:: @ 83E5388
.4byte OtherText_SoPretty
.4byte OtherText_SoDarling
.4byte OtherText_SoRelaxed
.4byte OtherText_SoSunny
.4byte OtherText_SoDesirable
.4byte OtherText_SoExciting
.4byte OtherText_SoAmusing
.4byte OtherText_SoMagical
.align 2
gUnknown_083E53A8:: @ 83E53A8
.4byte OtherText_WantVacationNicePlace
.4byte OtherText_BoughtCrayonsIsNice
.4byte OtherText_IfWeCouldFloat
.4byte OtherText_SandWashesAwayMakeSad
.4byte OtherText_WhatsBottomSeaLike
.4byte OtherText_SeeSettingSun
.4byte OtherText_LyingInGreenGrass
.4byte OtherText_SecretBasesWonderful
.align 1
gUnknown_083E53C8:: @ 83E53C8
.2byte 0x0, 0
.2byte 0xC, 0
.2byte 0xD, 0
.2byte 0x12, 0
.2byte 0x13, 0
.2byte 0x15, 0
.align 2
gUnknown_083E53E0:: @ 83E53E0
.4byte 0x132, UnknownString_81AEFFC, UnknownString_81AF013, UnknownString_81AF022
.4byte 0x102, UnknownString_81AF0A3, UnknownString_81AF0BB, UnknownString_81AF0CA
.4byte 0x103, UnknownString_81AF149, UnknownString_81AF164, UnknownString_81AF174
.4byte 0x104, UnknownString_81AF1E5, UnknownString_81AF1FD, UnknownString_81AF20A
.4byte 0x106, UnknownString_81AF281, UnknownString_81AF299, UnknownString_81AF2A9
.4byte 0x109, UnknownString_81AF32C, UnknownString_81AF345, UnknownString_81AF34D
.4byte 0x10b, UnknownString_81AF3D0, UnknownString_81AF3ED, UnknownString_81AF3FC
.4byte 0x10c, UnknownString_81AF46D, UnknownString_81AF481, UnknownString_81AF49B
.4byte 0x10d, UnknownString_81AF511, UnknownString_81AF529, UnknownString_81AF536
.4byte 0x10e, UnknownString_81AF5A9, UnknownString_81AF5BD, UnknownString_81AF5CD
.4byte 0x10f, UnknownString_81AF63F, UnknownString_81AF661, UnknownString_81AF676
.4byte 0x110, UnknownString_81AF711, UnknownString_81AF726, UnknownString_81AF73D
.4byte 0x111, UnknownString_81AF7BF, UnknownString_81AF7D9, UnknownString_81AF7F1
.4byte 0x112, UnknownString_81AF88A, UnknownString_81AF8A1, UnknownString_81AF8AA
.4byte 0x113, UnknownString_81AF91B, UnknownString_81AF935, UnknownString_81AF943
.4byte 0x114, UnknownString_81AF9C8, UnknownString_81AF9E0, UnknownString_81AF9F6
.4byte 0x11a, UnknownString_81AFA79, UnknownString_81AFA92, UnknownString_81AFA9E
.4byte 0x11b, UnknownString_81AFB17, UnknownString_81AFB2D, UnknownString_81AFB48
.4byte 0x11c, UnknownString_81AFBD8, UnknownString_81AFBE7, UnknownString_81AFC04
.4byte 0x21d, UnknownString_81AFC8A, UnknownString_81AFC9D, UnknownString_81AFCBE
.4byte 0x11e, UnknownString_81AFD44, UnknownString_81AFD60, UnknownString_81AFD80
.4byte 0x121, UnknownString_81AFE1D, UnknownString_81AFE36, UnknownString_81AFE42
.4byte 0x124, UnknownString_81AFEC2, UnknownString_81AFEDD, UnknownString_81AFEEE
.4byte 0x125, UnknownString_81AFF68, UnknownString_81AFF7B, UnknownString_81AFF88
.4byte 0x126, UnknownString_81AFFFB, UnknownString_81B000D, UnknownString_81B0015
.4byte 0x127, UnknownString_81B009D, UnknownString_81B00B6, UnknownString_81B00C9
.4byte 0x128, UnknownString_81B014D, UnknownString_81B0165, UnknownString_81B0173
.4byte 0x129, UnknownString_81B01E9, UnknownString_81B0201, UnknownString_81B0213
.4byte 0x12a, UnknownString_81B0290, UnknownString_81B02A5, UnknownString_81B02B6
.4byte 0x12b, UnknownString_81B0337, UnknownString_81B0351, UnknownString_81B0364
.4byte 0x12c, UnknownString_81B03E9, UnknownString_81B0401, UnknownString_81B040C
.4byte 0x12d, UnknownString_81B046E, UnknownString_81B0489, UnknownString_81B049A
.4byte 0x12e, UnknownString_81B0523, UnknownString_81B053E, UnknownString_81B0554
.4byte 0x12f, UnknownString_81B05D8, UnknownString_81B05F3, UnknownString_81B0610
.4byte 0x130, UnknownString_81B06A9, UnknownString_81B06C6, UnknownString_81B06D9
gUnknown_083E5610:: @ 83E5610
.4byte 0x131, UnknownString_81B0763, UnknownString_81B0781, UnknownString_81B0797
.align 2
gUnknown_083E5620:: @ 83E5620
.4byte 0x24
.4byte gSaveBlock1 + 0x2D94
.4byte 0xC
data/mon_pokeblock_anims.inc
-133
View File
@@ -1,133 +0,0 @@
gNatureToMonPokeblockAnim:: @ 8411A10
.byte 0, 0 @ HARDY
.byte 3, 0 @ LONELY
.byte 4, 1 @ BRAVE
.byte 5, 0 @ ADAMANT
.byte 10, 0 @ NAUGHTY
.byte 13, 0 @ BOLD
.byte 15, 0 @ DOCILE
.byte 16, 2 @ RELAXED
.byte 18, 0 @ IMPISH
.byte 19, 0 @ LAX
.byte 20, 0 @ TIMID
.byte 25, 0 @ HASTY
.byte 27, 3 @ SERIOUS
.byte 28, 0 @ JOLLY
.byte 29, 0 @ NAIVE
.byte 33, 4 @ MODEST
.byte 36, 0 @ MILD
.byte 37, 0 @ QUIET
.byte 39, 0 @ BASHFUL
.byte 42, 0 @ RASH
.byte 45, 0 @ CALM
.byte 46, 5 @ GENTLE
.byte 47, 6 @ SASSY
.byte 48, 0 @ CAREFUL
.byte 53, 0 @ QUIRKY
.align 1
gMonPokeblockAnims:: @ 8411A42
@ HARDY
.2byte 0, 4, 0, 8, 24, 0, 0, 0, 12, 0
.2byte 0, 4, 0, 16, 24, 0, 0, 0, 12, 0
.2byte 0, 4, 0, 32, 32, 0, 0, 0, 16, 1
@ LONELY
.2byte 0, 3, 6, 0, 48, 0, 0, 0, 24, 1
@ BRAVE
.2byte 64, 16, -24, 0, 32, 0, 0, 0, 0, 1
@ ADAMANT
.2byte 0, 4, 8, 0, 16, 0, -8, 0, 0, 0
.2byte 0, 0, 0, 0, 16, 0, 0, 0, 0, 0
.2byte 0, 4, 8, 0, 16, 0, -8, 0, 0, 0
.2byte 0, 0, 0, 0, 16, 0, 0, 0, 0, 0
.2byte 0, 4, -16, 0, 4, 0, 16, 0, 0, 1
@ NAUGHTY
.2byte 0, 3, 6, 0, 12, 0, 0, 0, 6, 0
.2byte 0, 3, -6, 0, 12, 0, 0, 0, 6, 0
.2byte 0, 16, 16, 0, 45, 1, 0, 0, 0, 1
@ BOLD
.2byte 0, 16, 0, 24, 32, 0, 0, 0, 16, 0
.2byte 0, 16, 0, 23, 32, 0, 0, 0, 16, 1
@ DOCILE
.2byte 0, 0, 0, 0, 80, 0, 0, 0, 0, 1
@ RELAXED
.2byte 0, 2, 8, 0, 32, 0, 0, 0, 0, 0
.2byte 0, 2, -8, 0, 32, 0, 0, 0, 0, 1
@ IMPISH
.2byte 0, 32, 2, 1, 48, 1, 0, 0, 24, 1
@ LAX
.2byte 0, 2, 16, 16, 128, 0, 0, 0, 0, 1
@ TIMID
.2byte 0, 2, -8, 0, 48, 0, -24, 0, 0, 0
.2byte 0, 0, 0, 0, 8, 0, 0, 0, 0, 0
.2byte 64, 32, 2, 0, 36, 0, 0, 0, 0, 0
.2byte 0, 0, 0, 0, 8, 0, 0, 0, 0, 0
.2byte 0, 2, 8, 0, 48, 0, 24, 0, 0, 1
@ HASTY
.2byte 64, 24, 16, 0, 32, 0, 0, 0, 0, 0
.2byte 0, 28, 2, 1, 32, 1, 0, 0, 16, 1
@ SERIOUS
.2byte 0, 0, 0, 0, 32, 0, 0, 0, 0, 1
@ JOLLY
.2byte 64, 16, -16, 2, 48, 0, 0, 0, 32, 1
@ NAIVE
.2byte 0, 12, -8, 4, 24, 0, 8, 0, 12, 0
.2byte 0, 12, 8, 8, 24, 0, -16, 0, 12, 0
.2byte 0, 12, -8, 16, 24, 0, 16, 0, 12, 0
.2byte 0, 12, 8, 28, 24, 0, -8, 0, 12, 1
@ MODEST
.2byte 0, 0, 0, 0, 8, 0, 0, 0, 0, 0
.2byte 64, 16, -4, 0, 32, 0, 0, 0, 0, 0
.2byte 0, 0, 0, 0, 8, 0, 0, 0, 0, 1
@ MILD
.2byte 128, 4, 0, 8, 64, 0, 0, 0, 0, 1
@ QUIET
.2byte 0, 2, 16, 0, 48, 0, 0, 0, 0, 0
.2byte 128, 2, 16, 0, 48, 0, 0, 0, 0, 1
@ BASHFUL
.2byte 0, 2, -4, 0, 48, 0, -48, 0, 0, 0
.2byte 0, 0, 0, 0, 80, 0, 0, 0, 0, 0
.2byte 0, 2, 8, 0, 24, 0, 48, 0, 0, 1
@ RASH
.2byte 64, 4, 64, 58, 52, 0, -88, 0, 0, 0
.2byte 0, 0, 0, 0, 80, 0, 0, 0, 0, 0
.2byte 0, 24, 80, 0, 32, 0, 88, 0, 0, 1
@ CALM
.2byte 0, 2, 16, 4, 64, 0, 0, 0, 0, 1
@ GENTLE
.2byte 0, 0, 0, 0, 32, 0, 0, 0, 0, 1
@ SASSY
.2byte 0, 0, 0, 0, 42, 0, 0, 0, 0, 1
@ CAREFUL
.2byte 0, 4, 0, 8, 24, 0, 0, 0, 12, 0
.2byte 0, 0, 0, 0, 12, 0, 0, 0, 0, 0
.2byte 0, 4, 0, 12, 24, 0, 0, 0, 12, 0
.2byte 0, 0, 0, 0, 12, 0, 0, 0, 0, 0
.2byte 0, 4, 0, 4, 24, 0, 0, 0, 12, 1
@ QUIRKY
.2byte 0, 4, 16, 12, 64, 0, 0, 0, 0, 0
.2byte 0, -4, 16, 12, 64, 0, 0, 0, 0, 1
data/pokeblock_feed.s
-225
View File
@@ -1,225 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
@ 8411A10
.include "data/mon_pokeblock_anims.inc"
.align 2
gSpriteAffineAnim_8411E90:: @ 8411E90
obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_8411EA0:: @ 8411EA0
obj_rot_scal_anim_frame 0x0, 0x0, 12, 1
obj_rot_scal_anim_frame 0x0, 0x0, 0, 30
obj_rot_scal_anim_frame 0x0, 0x0, -12, 1
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_8411EC0:: @ 8411EC0
obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
obj_rot_scal_anim_frame 0x0, 0x0, 12, 1
obj_rot_scal_anim_frame 0x0, 0x0, 0, 28
obj_rot_scal_anim_frame 0x0, 0x0, -4, 3
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_8411EE8:: @ 8411EE8
obj_rot_scal_anim_frame 0x0, 0x0, 1, 16
obj_rot_scal_anim_frame 0x0, 0x0, -1, 32
obj_rot_scal_anim_frame 0x0, 0x0, 1, 16
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_8411F08:: @ 8411F08
obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
obj_rot_scal_anim_frame 0x0, 0x0, 1, 16
obj_rot_scal_anim_frame 0x0, 0x0, -1, 32
obj_rot_scal_anim_frame 0x0, 0x0, 1, 16
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_8411F30:: @ 8411F30
obj_rot_scal_anim_frame 0x0, 0x0, -1, 8
obj_rot_scal_anim_frame 0x0, 0x0, 0, 16
obj_rot_scal_anim_frame 0x0, 0x0, 1, 8
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_8411F50:: @ 8411F50
obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
obj_rot_scal_anim_frame 0x0, 0x0, -1, 8
obj_rot_scal_anim_frame 0x0, 0x0, 0, 16
obj_rot_scal_anim_frame 0x0, 0x0, 1, 8
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_8411F78:: @ 8411F78
obj_rot_scal_anim_frame 0x0, 0x0, -1, 8
obj_rot_scal_anim_frame 0x0, 0x0, 0, 32
obj_rot_scal_anim_frame 0x0, 0x0, 1, 8
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_8411F98:: @ 8411F98
obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
obj_rot_scal_anim_frame 0x0, 0x0, -1, 8
obj_rot_scal_anim_frame 0x0, 0x0, 0, 32
obj_rot_scal_anim_frame 0x0, 0x0, 1, 8
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_8411FC0:: @ 8411FC0
obj_rot_scal_anim_frame 0x0, 0x0, -1, 4
obj_rot_scal_anim_frame 0x0, 0x0, 0, 24
obj_rot_scal_anim_frame 0x0, 0x0, 1, 4
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_8411FE0:: @ 8411FE0
obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
obj_rot_scal_anim_frame 0x0, 0x0, -1, 4
obj_rot_scal_anim_frame 0x0, 0x0, 0, 24
obj_rot_scal_anim_frame 0x0, 0x0, 1, 4
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_8412008:: @ 8412008
obj_rot_scal_anim_frame 0x0, 0x0, 1, 24
obj_rot_scal_anim_frame 0x0, 0x0, 0, 16
obj_rot_scal_anim_frame 0x0, 0x0, -12, 2
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_8412028:: @ 8412028
obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
obj_rot_scal_anim_frame 0x0, 0x0, 1, 24
obj_rot_scal_anim_frame 0x0, 0x0, 0, 16
obj_rot_scal_anim_frame 0x0, 0x0, -12, 2
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnimTable_8412050:: @ 8412050
.4byte gSpriteAffineAnim_8411E90
.4byte gSpriteAffineAnim_8411EA0
.4byte gSpriteAffineAnim_8411EE8
.4byte gSpriteAffineAnim_8411F30
.4byte gSpriteAffineAnim_8411F78
.4byte gSpriteAffineAnim_8411FC0
.4byte gSpriteAffineAnim_8412008
.4byte gSpriteAffineAnim_8411E90
.4byte gSpriteAffineAnim_8411E90
.4byte gSpriteAffineAnim_8411E90
.4byte gSpriteAffineAnim_8411E90
.4byte gSpriteAffineAnim_8411EC0
.4byte gSpriteAffineAnim_8411F08
.4byte gSpriteAffineAnim_8411F50
.4byte gSpriteAffineAnim_8411F98
.4byte gSpriteAffineAnim_8411FE0
.4byte gSpriteAffineAnim_8412028
.4byte gSpriteAffineAnim_8411E90
.4byte gSpriteAffineAnim_8411E90
.4byte gSpriteAffineAnim_8411E90
.4byte gSpriteAffineAnim_8411E90
.align 2
gUnknown_084120A4:: @ 84120A4
.4byte gPokeblockRed_Pal
.4byte gPokeblockBlue_Pal
.4byte gPokeblockPink_Pal
.4byte gPokeblockGreen_Pal
.4byte gPokeblockYellow_Pal
.4byte gPokeblockPurple_Pal
.4byte gPokeblockIndigo_Pal
.4byte gPokeblockBrown_Pal
.4byte gPokeblockLiteBlue_Pal
.4byte gPokeblockOlive_Pal
.4byte gPokeblockGray_Pal
.4byte gPokeblockBlack_Pal
.4byte gPokeblockWhite_Pal
.4byte gPokeblockGold_Pal
.align 2
gSpriteAffineAnim_84120DC:: @ 84120DC
obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnimTable_84120EC:: @ 84120EC
.4byte gSpriteAffineAnim_84120DC
.align 2
gSpriteAffineAnim_84120F0:: @ 84120F0
obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
obj_rot_scal_anim_frame 0x0, 0x0, -8, 1
obj_rot_scal_anim_frame 0x0, 0x0, -8, 1
obj_rot_scal_anim_frame 0x0, 0x0, -8, 1
obj_rot_scal_anim_frame 0x0, 0x0, -8, 1
obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
obj_rot_scal_anim_frame 0x0, 0x0, 16, 1
obj_rot_scal_anim_frame 0x0, 0x0, 16, 1
obj_rot_scal_anim_frame 0x0, 0x0, 16, 1
obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_8412148:: @ 8412148
obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
obj_rot_scal_anim_frame 0x0, 0x0, 8, 1
obj_rot_scal_anim_frame 0x0, 0x0, 8, 1
obj_rot_scal_anim_frame 0x0, 0x0, 8, 1
obj_rot_scal_anim_frame 0x0, 0x0, 8, 1
obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
obj_rot_scal_anim_frame 0x0, 0x0, -16, 1
obj_rot_scal_anim_frame 0x0, 0x0, -16, 1
obj_rot_scal_anim_frame 0x0, 0x0, -16, 1
obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnimTable_84121A0:: @ 84121A0
.4byte gSpriteAffineAnim_84120DC
.align 2
gSpriteAffineAnimTable_84121A4:: @ 84121A4
.4byte gSpriteAffineAnim_84120F0
.align 2
gSpriteAffineAnimTable_84121A8:: @ 84121A8
.4byte gSpriteAffineAnim_8412148
.align 2
gOamData_84121AC:: @ 84121AC
.2byte 0x0300
.2byte 0x0000
.2byte 0x0400
.align 2
gSpriteAnim_84121B4:: @ 84121B4
obj_image_anim_frame 0, 0
obj_image_anim_end
.align 2
gSpriteAnimTable_84121BC:: @ 84121BC
.4byte gSpriteAnim_84121B4
.align 2
gSpriteAffineAnim_84121C0:: @ 84121C0
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
obj_rot_scal_anim_frame 0xFFF8, 0xFFF8, 0, 1
obj_rot_scal_anim_jump 1
.align 2
gSpriteAffineAnimTable_84121D8:: @ 84121D8
.4byte gSpriteAffineAnim_84121C0
.align 2
gUnknown_084121DC:: @ 84121DC
obj_tiles gPokeblock_Gfx, 0x20, 14818
.align 2
gSpriteTemplate_84121E4:: @ 84121E4
spr_template 14818, 14818, gOamData_84121AC, gSpriteAnimTable_84121BC, NULL, gSpriteAffineAnimTable_84121D8, sub_81481B0
data/pokemon_menu.s
-82
View File
@@ -1,82 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gPokemonMenuActions:: @ 839F494
.4byte OtherText_Summary, PokemonMenu_Summary
.4byte OtherText_Switch2, PokemonMenu_Switch
.4byte OtherText_Item, PokemonMenu_Item
.4byte gOtherText_CancelNoTerminator, PokemonMenu_Cancel
.4byte OtherText_Give2, PokemonMenu_GiveItem
.4byte OtherText_Take2, PokemonMenu_TakeItem
.4byte OtherText_Take, PokemonMenu_TakeMail
.4byte OtherText_Mail, PokemonMenu_Mail
.4byte OtherText_Read2, PokemonMenu_ReadMail
.4byte gOtherText_CancelNoTerminator, PokemonMenu_CancelSubmenu
.4byte gMoveNames + 13 * MOVE_CUT, PokemonMenu_FieldMove
.4byte gMoveNames + 13 * MOVE_FLASH, PokemonMenu_FieldMove
.4byte gMoveNames + 13 * MOVE_ROCK_SMASH, PokemonMenu_FieldMove
.4byte gMoveNames + 13 * MOVE_STRENGTH, PokemonMenu_FieldMove
.4byte gMoveNames + 13 * MOVE_SURF, PokemonMenu_FieldMove
.4byte gMoveNames + 13 * MOVE_FLY, PokemonMenu_FieldMove
.4byte gMoveNames + 13 * MOVE_DIVE, PokemonMenu_FieldMove
.4byte gMoveNames + 13 * MOVE_WATERFALL, PokemonMenu_FieldMove
.4byte gMoveNames + 13 * MOVE_TELEPORT, PokemonMenu_FieldMove
.4byte gMoveNames + 13 * MOVE_DIG, PokemonMenu_FieldMove
.4byte gMoveNames + 13 * MOVE_SECRET_POWER, PokemonMenu_FieldMove
.4byte gMoveNames + 13 * MOVE_MILK_DRINK, PokemonMenu_FieldMove
.4byte gMoveNames + 13 * MOVE_SOFT_BOILED, PokemonMenu_FieldMove
.4byte gMoveNames + 13 * MOVE_SWEET_SCENT, PokemonMenu_FieldMove
.align 1
gUnknown_0839F554:: @ 839F554
.2byte MOVE_CUT
.2byte MOVE_FLASH
.2byte MOVE_ROCK_SMASH
.2byte MOVE_STRENGTH
.2byte MOVE_SURF
.2byte MOVE_FLY
.2byte MOVE_DIVE
.2byte MOVE_WATERFALL
.2byte MOVE_TELEPORT
.2byte MOVE_DIG
.2byte MOVE_SECRET_POWER
.2byte MOVE_MILK_DRINK
.2byte MOVE_SOFT_BOILED
.2byte MOVE_SWEET_SCENT
.2byte 0xFF
Unknown_39F572: @ 839F572
.byte 4, 5, 9, 0
.align 2
gUnknown_0839F578:: @ 839F578
.byte 3, 6, 0, 0
.4byte Unknown_39F572
Unknown_39F580: @ 839F580
.byte 8, 6, 9, 0
.align 2
gUnknown_0839F584:: @ 839F584
.byte 3, 9, 0, 0
.4byte Unknown_39F580
.align 2
gFieldMoveFuncs:: @ 839F58C
.4byte SetUpFieldMove_Cut, 0x6
.4byte SetUpFieldMove_Flash, 0x9
.4byte SetUpFieldMove_RockSmash, 0x9
.4byte SetUpFieldMove_Strength, 0x9
.4byte SetUpFieldMove_Surf, 0x7
.4byte SetUpFieldMove_Fly, 0x9
.4byte SetUpFieldMove_Dive, 0x9
.4byte SetUpFieldMove_Waterfall, 0x9
.4byte SetUpFieldMove_Teleport, 0x9
.4byte SetUpFieldMove_Dig, 0x9
.4byte SetUpFieldMove_SecretPower, 0x9
.4byte SetUpFieldMove_SoftBoiled, 0x10
.4byte SetUpFieldMove_SoftBoiled, 0x10
.4byte SetUpFieldMove_SweetScent, 0x9
data/rom4.s
-66
View File
@@ -1,66 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gDummyWarpData:: @ 8216624
.byte -1
.byte -1
.byte -1
.space 1
.2byte -1
.2byte -1
@ unused, unknown data
.byte 0xB0, 0x04, 0x00, 0x00
.byte 0x10, 0x0E, 0x00, 0x00
.byte 0xB0, 0x04, 0x00, 0x00
.byte 0x60, 0x09, 0x00, 0x00
.byte 0x32, 0x00, 0x00, 0x00
.byte 0x50, 0x00, 0x00, 0x00
.byte 0xD4, 0xFF, 0xFF, 0xFF
.byte 0x2C, 0x00, 0x00, 0x00
.align 2
gUnknown_0821664C:: @ 821664C
.4byte 0, 0
.4byte 0, 1
.4byte 0, -1
.4byte -1, 0
.4byte 1, 0
.4byte -1, 1
.4byte 1, 1
.4byte -1, -1
.4byte 1, -1
.align 2
gUnknown_08216694:: @ 8216694
.4byte REG_WIN0H
.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
.4byte 1
.align 2
gUnknown_082166A0:: @ 82166A0
.4byte sub_8055C68
.4byte sub_8055C88
.4byte sub_8055C8C
.align 2
gUnknown_082166AC:: @ 82166AC
.4byte sub_8055CAC
.4byte sub_8055CB0
.4byte sub_8055CB0
.4byte sub_8055CB0
.4byte sub_8055CB0
.4byte sub_8055CAC
.4byte sub_8055CAC
.4byte sub_8055D18
.4byte sub_8055D18
.4byte sub_8055D18
.4byte sub_8055D18
.align 2
gUnknown_082166D8:: @ 82166D8
.4byte sub_8055D30
.4byte sub_8055D38
data/scripts/bard.inc
-67
View File
@@ -1,67 +0,0 @@
MauvilleCity_PokemonCenter_1F_EventScript_1AE744:: @ 81AE744
special sub_80F7B14
switch RESULT
case 0, MauvilleCity_PokemonCenter_1F_EventScript_1AE784
case 1, MauvilleCity_PokemonCenter_1F_EventScript_1AE845
case 2, MauvilleCity_PokemonCenter_1F_EventScript_1AEBAB
case 3, MauvilleCity_PokemonCenter_1F_EventScript_1B0816
case 4, MauvilleCity_PokemonCenter_1F_EventScript_1B09EB
end
MauvilleCity_PokemonCenter_1F_EventScript_1AE784:: @ 81AE784
lock
faceplayer
msgbox MauvilleCity_PokemonCenter_1F_Text_1B0A91, 5
compare RESULT, 1
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7A5
compare RESULT, 0
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7C8
end
MauvilleCity_PokemonCenter_1F_EventScript_1AE7A5:: @ 81AE7A5
setvar 0x8004, 0
special sub_80F7C54
pause 60
special sub_80F7B2C
compare RESULT, 0
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7D2
msgbox MauvilleCity_PokemonCenter_1F_Text_1B0AED, 4
release
end
MauvilleCity_PokemonCenter_1F_EventScript_1AE7C8:: @ 81AE7C8
msgbox MauvilleCity_PokemonCenter_1F_Text_1B0AC3, 4
release
end
MauvilleCity_PokemonCenter_1F_EventScript_1AE7D2:: @ 81AE7D2
msgbox MauvilleCity_PokemonCenter_1F_Text_1B0B2C, 5
compare RESULT, 1
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7F1
compare RESULT, 0
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE83B
end
MauvilleCity_PokemonCenter_1F_EventScript_1AE7F1:: @ 81AE7F1
setvar 0x8004, 6
call MauvilleCity_PokemonCenter_1F_EventScript_1A00F3
lock
faceplayer
compare RESULT, 0
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE83B
msgbox MauvilleCity_PokemonCenter_1F_Text_1B0BD0, 4
setvar 0x8004, 1
special sub_80F7C54
pause 60
msgbox MauvilleCity_PokemonCenter_1F_Text_1B0BFA, 5
compare RESULT, 0
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7F1
special sub_80F7B40
msgbox MauvilleCity_PokemonCenter_1F_Text_1B0C23, 4
release
end
MauvilleCity_PokemonCenter_1F_EventScript_1AE83B:: @ 81AE83B
msgbox MauvilleCity_PokemonCenter_1F_Text_1B0BA6, 4
release
end
data/scripts/berry_tree.inc
+1 -1
View File
@@ -1,4 +1,4 @@
BerryTreeScript:: @ 81A14DD
S_BerryTree:: @ 81A14DD
special FieldObjectInteractionGetBerryTreeData
switch 0x8004
case 255, Route102_EventScript_1A1533
data/scripts/cable_club.inc
+4 -4
View File
@@ -191,7 +191,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EBC:: @ 81A3EBC
case 127, OldaleTown_PokemonCenter_2F_EventScript_1A4319
OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2
call OldaleTown_PokemonCenter_2F_EventScript_19F806
call S_DoSaveDialog
compare RESULT, 0
jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319
call OldaleTown_PokemonCenter_2F_EventScript_1A3FEF
@@ -215,7 +215,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2
jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A42F5
OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E
special HealPlayerParty
special ScrSpecial_HealPlayerParty
special SavePlayerParty
special LoadPlayerBag
copyvar 0x4087, 0x8004
@@ -361,7 +361,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA
call OldaleTown_PokemonCenter_2F_EventScript_1A41BB
compare RESULT, 0
jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319
call OldaleTown_PokemonCenter_2F_EventScript_19F806
call S_DoSaveDialog
compare RESULT, 0
jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319
message OldaleTown_PokemonCenter_2F_Text_1A490C
@@ -455,7 +455,7 @@ VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB
jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4229
OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229
call OldaleTown_PokemonCenter_2F_EventScript_19F806
call S_DoSaveDialog
compare RESULT, 0
jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319
message OldaleTown_PokemonCenter_2F_Text_1A490C
data/scripts/day_care.inc
+1 -1
View File
@@ -282,7 +282,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558
release
end
Event_EggHatch:: @ 81B25BC
S_EggHatch:: @ 81B25BC
lockall
msgbox UnknownString_81B2C68, 4
special EggHatch
data/scripts/giddy.inc
-51
View File
@@ -1,51 +0,0 @@
MauvilleCity_PokemonCenter_1F_EventScript_1B09EB:: @ 81B09EB
lock
faceplayer
msgbox MauvilleCity_PokemonCenter_1F_Text_1B092A, 5
compare RESULT, 1
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C
compare RESULT, 0
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A6F
end
MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C:: @ 81B0A0C
special sub_80F7CC8
compare RESULT, 1
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E
compare RESULT, 0
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A79
end
MauvilleCity_PokemonCenter_1F_EventScript_1B0A26:: @ 81B0A26
special sub_80F7CC8
compare RESULT, 1
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A40
compare RESULT, 0
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A79
end
MauvilleCity_PokemonCenter_1F_EventScript_1B0A40:: @ 81B0A40
msgbox MauvilleCity_PokemonCenter_1F_Text_1B0998, 4
jump MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E
end
MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E:: @ 81B0A4E
special sub_80F7CF4
special ShowFieldMessageStringVar4
waittext
yesnobox 20, 8
compare RESULT, 1
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A26
compare RESULT, 0
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A26
end
MauvilleCity_PokemonCenter_1F_EventScript_1B0A6F:: @ 81B0A6F
msgbox MauvilleCity_PokemonCenter_1F_Text_1B097C, 4
release
end
MauvilleCity_PokemonCenter_1F_EventScript_1B0A79:: @ 81B0A79
msgbox MauvilleCity_PokemonCenter_1F_Text_1B09B0, 4
release
end
data/scripts/hipster.inc
-25
View File
@@ -1,25 +0,0 @@
MauvilleCity_PokemonCenter_1F_EventScript_1AE845:: @ 81AE845
lock
faceplayer
setflag 2054
msgbox MauvilleCity_PokemonCenter_1F_Text_1B0C5B, 4
special sub_80F7C70
compare RESULT, 0
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE86A
msgbox MauvilleCity_PokemonCenter_1F_Text_1B0CA7, 4
release
end
MauvilleCity_PokemonCenter_1F_EventScript_1AE86A:: @ 81AE86A
special sub_80F7C90
compare RESULT, 1
jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE882
msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D11, 4
release
end
MauvilleCity_PokemonCenter_1F_EventScript_1AE882:: @ 81AE882
msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D75, 4
special sub_80F7C84
release
end
data/scripts/maps/AncientTomb.inc
+1 -1
View File
@@ -64,7 +64,7 @@ AncientTomb_EventScript_15F050:: @ 815F050
setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE
setflag 937
setflag 2145
special StartBattle_Regi
special ScrSpecial_StartRegiBattle
waitstate
clearflag 2145
release
data/scripts/maps/BattleTower_BattleRoom.inc
+2 -2
View File
@@ -20,7 +20,7 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA
msgbox 0x20234cc, 4
waittext
closebutton
special HealPlayerParty
special ScrSpecial_HealPlayerParty
setvar 0x8004, 0
setvar 0x8005, 0
special sub_813556C
@@ -56,7 +56,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961
special sub_8135A14
fanfare 368
waitfanfare
special HealPlayerParty
special ScrSpecial_HealPlayerParty
BattleTower_BattleRoom_EventScript_1609B2:: @ 81609B2
msgbox BattleTower_BattleRoom_Text_19AD09, 5
data/scripts/maps/BattleTower_Lobby.inc
+1 -1
View File
@@ -242,7 +242,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587
special LoadPlayerParty
closebutton
pause 2
call BattleTower_Lobby_EventScript_19F806
call S_DoSaveDialog
setvar 0x4000, 5
hidebox 0, 0, 15, 10
compare RESULT, 0

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