diff options
| author | yenatch <yenatch@gmail.com> | 2016-06-20 01:06:46 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-06-20 01:06:46 -0400 |
| commit | c21e746b2dde49532b89d119762f79982b719b7f (patch) | |
| tree | 6273318249aa372df3b2c76fd266b6b3e081a507 /asm | |
| parent | 13e93ecbb4036a1a19778a235ddb5992de1048ae (diff) | |
| parent | 422215e184c026037080032056b0ac56ba9429f5 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
data/data1.s
data/maps/text/SootopolisCity.s
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/rom4.s | 8 | ||||
| -rw-r--r-- | asm/rom5.s | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/asm/rom4.s b/asm/rom4.s index 3f6a94894..9ccb7491e 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -47963,7 +47963,7 @@ _0806853C: ldr r0, _08068550 b _080686EE .align 2, 0 -_08068550: .4byte gUnknown_0814D2FF +_08068550: .4byte ClosedSootopolisGymDoorScript _08068554: adds r0, r5, 0 bl is_tile_x84 @@ -48212,7 +48212,7 @@ _08068760: ldr r0, _08068764 b _0806876A .align 2, 0 -_08068764: .4byte WaterfallScript +_08068764: .4byte CannotUseWaterfallScript _08068768: movs r0, 0 _0806876A: @@ -48240,7 +48240,7 @@ sub_8068770: @ 8068770 b _0806879E .align 2, 0 _08068794: .4byte 0x0000080d -_08068798: .4byte gUnknown_081B1220 +_08068798: .4byte UseDiveScript _0806879C: movs r0, 0 _0806879E: @@ -48272,7 +48272,7 @@ sub_80687A4: @ 80687A4 .align 2, 0 _080687D0: .4byte 0x0000080d _080687D4: .4byte 0x0202e828 -_080687D8: .4byte gUnknown_081B1269 +_080687D8: .4byte UnderwaterUseDiveScript _080687DC: movs r0, 0 _080687DE: diff --git a/asm/rom5.s b/asm/rom5.s index e33cc2fca..7fa210b99 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -80659,7 +80659,7 @@ sub_80A2634: @ 80A2634 .align 2, 0 _080A2648: .4byte 0x0202ff84 _080A264C: .4byte 0x03005ce0 -_080A2650: .4byte gUnknown_081B0E16 +_080A2650: .4byte UseCutScript thumb_func_end sub_80A2634 thumb_func_start sub_80A2654 @@ -118089,7 +118089,7 @@ IsPlayerFacingPlantedBerryTree: @ 80B4A34 movs r0, 0x1 b _080B4A66 .align 2, 0 -_080B4A5C: .4byte gUnknown_081A14DD +_080B4A5C: .4byte BerryTreeScript _080B4A60: .4byte 0x03004ae0 _080B4A64: movs r0, 0 @@ -118110,7 +118110,7 @@ WaterBerryTree: @ 80B4A6C lsrs r0, 24 b _080B4A8A .align 2, 0 -_080B4A84: .4byte gUnknown_081A14DD +_080B4A84: .4byte BerryTreeScript _080B4A88: movs r0, 0 _080B4A8A: @@ -297503,7 +297503,7 @@ sub_810B53C: @ 810B53C .align 2, 0 _0810B550: .4byte 0x0202ff84 _0810B554: .4byte 0x03005ce0 -_0810B558: .4byte gUnknown_081B0F01 +_0810B558: .4byte UseRockSmashScript thumb_func_end sub_810B53C thumb_func_start oei_rocksmash @@ -328251,7 +328251,7 @@ sub_811AA18: @ 811AA18 .align 2, 0 _0811AA2C: .4byte 0x0202ff84 _0811AA30: .4byte 0x03005ce0 -_0811AA34: .4byte gUnknown_081B100E +_0811AA34: .4byte UseStrengthScript thumb_func_end sub_811AA18 thumb_func_start sub_811AA38 @@ -364387,7 +364387,7 @@ _0812C136: bx r0 .align 2, 0 _0812C13C: .4byte 0x0202f388 -_0812C140: .4byte gUnknown_081B140C +_0812C140: .4byte SweetScentNothingHereScript thumb_func_end sub_812C118 thumb_func_start sub_812C144 |