Game-Decompilation/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2024-12-04 03:01:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More incbins in data/event_scripts.s.

Browse Source
This commit is contained in:
yenatch 2016-06-27 00:58:25 -04:00
parent b16d34c82e
commit c306d47045
5 changed files with 1151 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/rom4.s
View File

@ -47941,7 +47941,7 @@ sub_8068500: @ 8068500
ldr r0, _08068520
b _080686EE
.align 2, 0
_08068520: .4byte gUnknown_081A6E72
_08068520: .4byte Event_TV
_08068524:
adds r0, r5, 0
bl MetatileBehavior_IsPC
@ -48007,7 +48007,7 @@ _0806859C:
ldr r0, _080685B0
b _080686EE
.align 2, 0
_080685B0: .4byte gUnknown_081A02D6
_080685B0: .4byte Event_WorldMap
_080685B4:
adds r0, r5, 0
bl sub_805791C
@ -48018,7 +48018,7 @@ _080685B4:
ldr r0, _080685C8
b _080686EE
.align 2, 0
_080685C8: .4byte gUnknown_081B6E5A
_080685C8: .4byte Event_RunningShoesManual
_080685CC:
adds r0, r5, 0
bl sub_8057930
@ -48401,7 +48401,7 @@ _080688B4:
ldr r0, _080688C8
b _080688E8
.align 2, 0
_080688C8: .4byte gUnknown_081B25BC
_080688C8: .4byte Event_EggHatch
_080688CC:
bl safari_step
lsls r0, 24

24
asm/rom5.s
View File

@ -89669,7 +89669,7 @@ _080A6D8A:
pop {r1}
bx r1
.align 2, 0
_080A6D94: .4byte gUnknown_081A14AF
_080A6D94: .4byte Event_NoRegisteredItem
thumb_func_end sub_80A6D1C
thumb_func_start sub_80A6D98
@ -135221,70 +135221,70 @@ sub_80BCCE8: @ 80BCCE8
b _080BCD72
.align 2, 0
_080BCD08: .4byte 0x00004054
_080BCD0C: .4byte gUnknown_081A1BB2
_080BCD0C: .4byte UnknownString_81A1BB2
_080BCD10:
cmp r0, 0x1
bne _080BCD1C
ldr r0, _080BCD18
b _080BCD72
.align 2, 0
_080BCD18: .4byte gUnknown_081A1F67
_080BCD18: .4byte UnknownString_81A1F67
_080BCD1C:
cmp r0, 0x2
bne _080BCD28
ldr r0, _080BCD24
b _080BCD72
.align 2, 0
_080BCD24: .4byte gUnknown_081A2254
_080BCD24: .4byte UnknownString_81A2254
_080BCD28:
cmp r0, 0x3
bne _080BCD34
ldr r0, _080BCD30
b _080BCD72
.align 2, 0
_080BCD30: .4byte gUnknown_081A25C3
_080BCD30: .4byte UnknownString_81A25C3
_080BCD34:
cmp r0, 0x4
bne _080BCD40
ldr r0, _080BCD3C
b _080BCD72
.align 2, 0
_080BCD3C: .4byte gUnknown_081A2925
_080BCD3C: .4byte UnknownString_81A2925
_080BCD40:
cmp r0, 0x5
bne _080BCD4C
ldr r0, _080BCD48
b _080BCD72
.align 2, 0
_080BCD48: .4byte gUnknown_081A1D74
_080BCD48: .4byte UnknownString_81A1D74
_080BCD4C:
cmp r0, 0x6
bne _080BCD58
ldr r0, _080BCD54
b _080BCD72
.align 2, 0
_080BCD54: .4byte gUnknown_081A20C9
_080BCD54: .4byte UnknownString_81A20C9
_080BCD58:
cmp r0, 0x7
bne _080BCD64
ldr r0, _080BCD60
b _080BCD72
.align 2, 0
_080BCD60: .4byte gUnknown_081A2439
_080BCD60: .4byte UnknownString_81A2439
_080BCD64:
cmp r1, 0x8
beq _080BCD70
ldr r0, _080BCD6C
b _080BCD72
.align 2, 0
_080BCD6C: .4byte gUnknown_081A2B2A
_080BCD6C: .4byte UnknownString_81A2B2A
_080BCD70:
ldr r0, _080BCD78
_080BCD72:
pop {r1}
bx r1
.align 2, 0
_080BCD78: .4byte gUnknown_081A2754
_080BCD78: .4byte UnknownString_81A2754
thumb_func_end sub_80BCCE8
thumb_func_start unref_sub_80BCD7C
@ -152785,7 +152785,7 @@ _080C57F4:
strh r0, [r4]
b _080C581A
.align 2, 0
_080C5808: .4byte gUnknown_081A1132
_080C5808: .4byte UnknownString_81A1132
_080C580C:
ldr r0, _080C5820
strh r1, [r0]

1322
data/event_scripts.s
View File

File diff suppressed because it is too large Load Diff

4
data/item_ball_scripts.s
View File

@ -533,3 +533,7 @@ VictoryRoad_B1F_EventScript_1B1AED:: @ 81B1AED
VictoryRoad_B2F_EventScript_1B1AFA:: @ 81B1AFA
giveitem ITEM_FULL_HEAL, 1, 1
end
@ 81B1B07
giveitem ITEM_HM08, 1, 1
end

2
data/maps/text/Route117_PokemonDayCare.s
View File

@ -74,5 +74,5 @@ Route117_PokemonDayCare_Text_1B2C17:: @ 81B2C17
UnknownString_81B2C68: @ 81B2C68
.string "Huh?$"
@ XXX JP
.incbin "baserom.gba", 0x1B2C6D, 0x28