ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

renaming

Browse Source
This commit is contained in:
YamaArashi 2015-10-14 14:37:16 -07:00
parent 27061f496e
commit a6f32421bb
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/emerald.s
View File

@ -435941,7 +435941,7 @@ AreMovesContestCombo: ; 80E5414
cmp r4, r1
bne @080E5470
@080E545E:
ldr r0, =gComboStarterLut
ldr r0, =gComboStarterLookupTable
adds r0, r4, r0
ldrb r0, [r0]
b @080E5472
@ -436945,7 +436945,7 @@ ContestEffectFunc_080E5AD4: ; 80E5AD4
ldr r1, =gContestMoves
adds r0, r1
ldrb r0, [r0, 0x2]
ldr r2, =gComboStarterLut
ldr r2, =gComboStarterLookupTable
adds r0, r2
ldrb r1, [r0]
lsls r0, r1, 2

2
constants/pokemon_data_constants.s
View File

@ -33,7 +33,7 @@
.set BODY_COLOR_WHITE, 0x08
.set BODY_COLOR_PINK, 0x09
.set SUMMARY_SCREEN_FLIP_SPRITE, 0x80
.set F_SUMMARY_SCREEN_FLIP_SPRITE, 0x80
.set EVO_FRIENDSHIP, 0x0001 ; Pokémon levels up with friendship ≥ 220
.set EVO_FRIENDSHIP_DAY, 0x0002 ; Pokémon levels up during the day with friendship ≥ 220

36
data/base_stats.s
View File

@ -1261,7 +1261,7 @@ gBaseStats: ; 83203CC
.byte ABILITY_WATER_ABSORB
.byte ABILITY_DAMP
.byte 0 ; Safari Zone flee rate
.byte SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BLUE
.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BLUE
.2byte 0 ; padding
; Poliwhirl
@ -1282,7 +1282,7 @@ gBaseStats: ; 83203CC
.byte ABILITY_WATER_ABSORB
.byte ABILITY_DAMP
.byte 0 ; Safari Zone flee rate
.byte SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BLUE
.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BLUE
.2byte 0 ; padding
; Poliwrath
@ -1303,7 +1303,7 @@ gBaseStats: ; 83203CC
.byte ABILITY_WATER_ABSORB
.byte ABILITY_DAMP
.byte 0 ; Safari Zone flee rate
.byte SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BLUE
.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BLUE
.2byte 0 ; padding
; Abra
@ -2080,7 +2080,7 @@ gBaseStats: ; 83203CC
.byte ABILITY_HYPER_CUTTER
.byte ABILITY_SHELL_ARMOR
.byte 0 ; Safari Zone flee rate
.byte SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_RED
.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_RED
.2byte 0 ; padding
; Voltorb
@ -2626,7 +2626,7 @@ gBaseStats: ; 83203CC
.byte ABILITY_STATIC
.byte ABILITY_NONE
.byte 0 ; Safari Zone flee rate
.byte SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_YELLOW
.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_YELLOW
.2byte 0 ; padding
; Magmar
@ -3340,7 +3340,7 @@ gBaseStats: ; 83203CC
.byte ABILITY_TORRENT
.byte ABILITY_NONE
.byte 0 ; Safari Zone flee rate
.byte SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BLUE
.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BLUE
.2byte 0 ; padding
; Feraligatr
@ -3655,7 +3655,7 @@ gBaseStats: ; 83203CC
.byte ABILITY_CUTE_CHARM
.byte ABILITY_NONE
.byte 0 ; Safari Zone flee rate
.byte SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_PINK
.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_PINK
.2byte 0 ; padding
; Togepi
@ -3907,7 +3907,7 @@ gBaseStats: ; 83203CC
.byte ABILITY_WATER_ABSORB
.byte ABILITY_DAMP
.byte 0 ; Safari Zone flee rate
.byte SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_GREEN
.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_GREEN
.2byte 0 ; padding
; Hoppip
@ -4222,7 +4222,7 @@ gBaseStats: ; 83203CC
.byte ABILITY_LEVITATE
.byte ABILITY_NONE
.byte 0 ; Safari Zone flee rate
.byte SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BLACK
.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BLACK
.2byte 0 ; padding
; Wobbuffet
@ -4516,7 +4516,7 @@ gBaseStats: ; 83203CC
.byte ABILITY_INNER_FOCUS
.byte ABILITY_KEEN_EYE
.byte 0 ; Safari Zone flee rate
.byte SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BLACK
.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BLACK
.2byte 0 ; padding
; Teddiursa
@ -4537,7 +4537,7 @@ gBaseStats: ; 83203CC
.byte ABILITY_PICKUP
.byte ABILITY_NONE
.byte 0 ; Safari Zone flee rate
.byte SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BROWN
.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BROWN
.2byte 0 ; padding
; Ursaring
@ -5020,7 +5020,7 @@ gBaseStats: ; 83203CC
.byte ABILITY_STATIC
.byte ABILITY_NONE
.byte 0 ; Safari Zone flee rate
.byte SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_YELLOW
.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_YELLOW
.2byte 0 ; padding
; Magby
@ -6469,7 +6469,7 @@ gBaseStats: ; 83203CC
.byte ABILITY_OWN_TEMPO
.byte ABILITY_NONE
.byte 0 ; Safari Zone flee rate
.byte SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BROWN
.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BROWN
.2byte 0 ; padding
; Wingull
@ -7624,7 +7624,7 @@ gBaseStats: ; 83203CC
.byte ABILITY_NATURAL_CURE
.byte ABILITY_POISON_POINT
.byte 0 ; Safari Zone flee rate
.byte SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_GREEN
.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_GREEN
.2byte 0 ; padding
; Slakoth
@ -7897,7 +7897,7 @@ gBaseStats: ; 83203CC
.byte ABILITY_PRESSURE
.byte ABILITY_NONE
.byte 0 ; Safari Zone flee rate
.byte SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_WHITE
.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_WHITE
.2byte 0 ; padding
; Shuppet
@ -7960,7 +7960,7 @@ gBaseStats: ; 83203CC
.byte ABILITY_SHED_SKIN
.byte ABILITY_NONE
.byte 0 ; Safari Zone flee rate
.byte SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BLACK
.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BLACK
.2byte 0 ; padding
; Zangoose
@ -7981,7 +7981,7 @@ gBaseStats: ; 83203CC
.byte ABILITY_IMMUNITY
.byte ABILITY_NONE
.byte 0 ; Safari Zone flee rate
.byte SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_WHITE
.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_WHITE
.2byte 0 ; padding
; Relicanth
@ -8611,7 +8611,7 @@ gBaseStats: ; 83203CC
.byte ABILITY_PRESSURE
.byte ABILITY_NONE
.byte 0 ; Safari Zone flee rate
.byte SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_RED
.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_RED
.2byte 0 ; padding
; Chimecho

4
data/data2.s
View File

@ -4484,9 +4484,9 @@ gUnknown_0858C2AC: ; 858C2AC
; 858CDCC
.include "data/contest_effects.s"
; A look-up table with a 1 for each combo starter ID and a 0 for ID 0,
; A lookup table with a 1 for each combo starter ID and a 0 for ID 0,
; which means "not a combo starter move".
gComboStarterLut: ; 858CE8C
gComboStarterLookupTable: ; 858CE8C
.byte 0
.rept 62
.byte 1