ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-09 14:53:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #429 from nullableVoidPtr/master

Browse Source 
Various fixes and cleanups
This commit is contained in:
Diegoisawesome 2018-12-08 21:44:12 -06:00 committed by GitHub
commit 0b91d2948a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
125 changed files with 29614 additions and 25811 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/malloc.h → include/alloc.h
View File

@ -1,5 +1,5 @@
#ifndef GUARD_MALLOC_H #ifndef GUARD_ALLOC_H
#define GUARD_MALLOC_H #define GUARD_ALLOC_H
#define HEAP_SIZE 0x1C000 #define HEAP_SIZE 0x1C000
#define malloc Alloc #define malloc Alloc
@ -19,4 +19,4 @@ void *AllocZeroed(u32 size);
void Free(void *pointer); void Free(void *pointer);
void InitHeap(void *pointer, u32 size); void InitHeap(void *pointer, u32 size);
#endif // GUARD_MALLOC_H #endif // GUARD_ALLOC_H

746
include/constants/battle_string_ids.h
View File

@ -5,382 +5,382 @@
#define BATTLESTRINGS_ID_ADDER 12 // all battlestrings have its ID + 12, because first 5 are reserved #define BATTLESTRINGS_ID_ADDER 12 // all battlestrings have its ID + 12, because first 5 are reserved
#define STRINGID_INTROMSG 0 #define STRINGID_INTROMSG 0
#define STRINGID_INTROSENDOUT 1 #define STRINGID_INTROSENDOUT 1
#define STRINGID_RETURNMON 2 #define STRINGID_RETURNMON 2
#define STRINGID_SWITCHINMON 3 #define STRINGID_SWITCHINMON 3
#define STRINGID_USEDMOVE 4 #define STRINGID_USEDMOVE 4
#define STRINGID_BATTLEEND 5 #define STRINGID_BATTLEEND 5
// todo: make some of those names less vague: attacker/target vs pkmn, etc. // todo: make some of those names less vague: attacker/target vs pkmn, etc.
#define STRINGID_TRAINER1LOSETEXT 12 #define STRINGID_TRAINER1LOSETEXT 12
#define STRINGID_PKMNGAINEDEXP 13 #define STRINGID_PKMNGAINEDEXP 13
#define STRINGID_PKMNGREWTOLV 14 #define STRINGID_PKMNGREWTOLV 14
#define STRINGID_PKMNLEARNEDMOVE 15 #define STRINGID_PKMNLEARNEDMOVE 15
#define STRINGID_TRYTOLEARNMOVE1 16 #define STRINGID_TRYTOLEARNMOVE1 16
#define STRINGID_TRYTOLEARNMOVE2 17 #define STRINGID_TRYTOLEARNMOVE2 17
#define STRINGID_TRYTOLEARNMOVE3 18 #define STRINGID_TRYTOLEARNMOVE3 18
#define STRINGID_PKMNFORGOTMOVE 19 #define STRINGID_PKMNFORGOTMOVE 19
#define STRINGID_STOPLEARNINGMOVE 20 #define STRINGID_STOPLEARNINGMOVE 20
#define STRINGID_DIDNOTLEARNMOVE 21 #define STRINGID_DIDNOTLEARNMOVE 21
#define STRINGID_PKMNLEARNEDMOVE2 22 #define STRINGID_PKMNLEARNEDMOVE2 22
#define STRINGID_ATTACKMISSED 23 #define STRINGID_ATTACKMISSED 23
#define STRINGID_PKMNPROTECTEDITSELF 24 #define STRINGID_PKMNPROTECTEDITSELF 24
#define STRINGID_STATSWONTINCREASE2 25 #define STRINGID_STATSWONTINCREASE2 25
#define STRINGID_AVOIDEDDAMAGE 26 #define STRINGID_AVOIDEDDAMAGE 26
#define STRINGID_ITDOESNTAFFECT 27 #define STRINGID_ITDOESNTAFFECT 27
#define STRINGID_ATTACKERFAINTED 28 #define STRINGID_ATTACKERFAINTED 28
#define STRINGID_TARGETFAINTED 29 #define STRINGID_TARGETFAINTED 29
#define STRINGID_PLAYERGOTMONEY 30 #define STRINGID_PLAYERGOTMONEY 30
#define STRINGID_PLAYERWHITEOUT 31 #define STRINGID_PLAYERWHITEOUT 31
#define STRINGID_PLAYERWHITEOUT2 32 #define STRINGID_PLAYERWHITEOUT2 32
#define STRINGID_PREVENTSESCAPE 33 #define STRINGID_PREVENTSESCAPE 33
#define STRINGID_HITXTIMES 34 #define STRINGID_HITXTIMES 34
#define STRINGID_PKMNFELLASLEEP 35 #define STRINGID_PKMNFELLASLEEP 35
#define STRINGID_PKMNMADESLEEP 36 #define STRINGID_PKMNMADESLEEP 36
#define STRINGID_PKMNALREADYASLEEP 37 #define STRINGID_PKMNALREADYASLEEP 37
#define STRINGID_PKMNALREADYASLEEP2 38 #define STRINGID_PKMNALREADYASLEEP2 38
#define STRINGID_PKMNWASNTAFFECTED 39 #define STRINGID_PKMNWASNTAFFECTED 39
#define STRINGID_PKMNWASPOISONED 40 #define STRINGID_PKMNWASPOISONED 40
#define STRINGID_PKMNPOISONEDBY 41 #define STRINGID_PKMNPOISONEDBY 41
#define STRINGID_PKMNHURTBYPOISON 42 #define STRINGID_PKMNHURTBYPOISON 42
#define STRINGID_PKMNALREADYPOISONED 43 #define STRINGID_PKMNALREADYPOISONED 43
#define STRINGID_PKMNBADLYPOISONED 44 #define STRINGID_PKMNBADLYPOISONED 44
#define STRINGID_PKMNENERGYDRAINED 45 #define STRINGID_PKMNENERGYDRAINED 45
#define STRINGID_PKMNWASBURNED 46 #define STRINGID_PKMNWASBURNED 46
#define STRINGID_PKMNBURNEDBY 47 #define STRINGID_PKMNBURNEDBY 47
#define STRINGID_PKMNHURTBYBURN 48 #define STRINGID_PKMNHURTBYBURN 48
#define STRINGID_PKMNWASFROZEN 49 #define STRINGID_PKMNWASFROZEN 49
#define STRINGID_PKMNFROZENBY 50 #define STRINGID_PKMNFROZENBY 50
#define STRINGID_PKMNISFROZEN 51 #define STRINGID_PKMNISFROZEN 51
#define STRINGID_PKMNWASDEFROSTED 52 #define STRINGID_PKMNWASDEFROSTED 52
#define STRINGID_PKMNWASDEFROSTED2 53 #define STRINGID_PKMNWASDEFROSTED2 53
#define STRINGID_PKMNWASDEFROSTEDBY 54 #define STRINGID_PKMNWASDEFROSTEDBY 54
#define STRINGID_PKMNWASPARALYZED 55 #define STRINGID_PKMNWASPARALYZED 55
#define STRINGID_PKMNWASPARALYZEDBY 56 #define STRINGID_PKMNWASPARALYZEDBY 56
#define STRINGID_PKMNISPARALYZED 57 #define STRINGID_PKMNISPARALYZED 57
#define STRINGID_PKMNISALREADYPARALYZED 58 #define STRINGID_PKMNISALREADYPARALYZED 58
#define STRINGID_PKMNHEALEDPARALYSIS 59 #define STRINGID_PKMNHEALEDPARALYSIS 59
#define STRINGID_PKMNDREAMEATEN 60 #define STRINGID_PKMNDREAMEATEN 60
#define STRINGID_STATSWONTINCREASE 61 #define STRINGID_STATSWONTINCREASE 61
#define STRINGID_STATSWONTDECREASE 62 #define STRINGID_STATSWONTDECREASE 62
#define STRINGID_TEAMSTOPPEDWORKING 63 #define STRINGID_TEAMSTOPPEDWORKING 63
#define STRINGID_FOESTOPPEDWORKING 64 #define STRINGID_FOESTOPPEDWORKING 64
#define STRINGID_PKMNISCONFUSED 65 #define STRINGID_PKMNISCONFUSED 65
#define STRINGID_PKMNHEALEDCONFUSION 66 #define STRINGID_PKMNHEALEDCONFUSION 66
#define STRINGID_PKMNWASCONFUSED 67 #define STRINGID_PKMNWASCONFUSED 67
#define STRINGID_PKMNALREADYCONFUSED 68 #define STRINGID_PKMNALREADYCONFUSED 68
#define STRINGID_PKMNFELLINLOVE 69 #define STRINGID_PKMNFELLINLOVE 69
#define STRINGID_PKMNINLOVE 70 #define STRINGID_PKMNINLOVE 70
#define STRINGID_PKMNIMMOBILIZEDBYLOVE 71 #define STRINGID_PKMNIMMOBILIZEDBYLOVE 71
#define STRINGID_PKMNBLOWNAWAY 72 #define STRINGID_PKMNBLOWNAWAY 72
#define STRINGID_PKMNCHANGEDTYPE 73 #define STRINGID_PKMNCHANGEDTYPE 73
#define STRINGID_PKMNFLINCHED 74 #define STRINGID_PKMNFLINCHED 74
#define STRINGID_PKMNREGAINEDHEALTH 75 #define STRINGID_PKMNREGAINEDHEALTH 75
#define STRINGID_PKMNHPFULL 76 #define STRINGID_PKMNHPFULL 76
#define STRINGID_PKMNRAISEDSPDEF 77 #define STRINGID_PKMNRAISEDSPDEF 77
#define STRINGID_PKMNRAISEDDEF 78 #define STRINGID_PKMNRAISEDDEF 78
#define STRINGID_PKMNCOVEREDBYVEIL 79 #define STRINGID_PKMNCOVEREDBYVEIL 79
#define STRINGID_PKMNUSEDSAFEGUARD 80 #define STRINGID_PKMNUSEDSAFEGUARD 80
#define STRINGID_PKMNSAFEGUARDEXPIRED 81 #define STRINGID_PKMNSAFEGUARDEXPIRED 81
#define STRINGID_PKMNWENTTOSLEEP 82 #define STRINGID_PKMNWENTTOSLEEP 82
#define STRINGID_PKMNSLEPTHEALTHY 83 #define STRINGID_PKMNSLEPTHEALTHY 83
#define STRINGID_PKMNWHIPPEDWHIRLWIND 84 #define STRINGID_PKMNWHIPPEDWHIRLWIND 84
#define STRINGID_PKMNTOOKSUNLIGHT 85 #define STRINGID_PKMNTOOKSUNLIGHT 85
#define STRINGID_PKMNLOWEREDHEAD 86 #define STRINGID_PKMNLOWEREDHEAD 86
#define STRINGID_PKMNISGLOWING 87 #define STRINGID_PKMNISGLOWING 87
#define STRINGID_PKMNFLEWHIGH 88 #define STRINGID_PKMNFLEWHIGH 88
#define STRINGID_PKMNDUGHOLE 89 #define STRINGID_PKMNDUGHOLE 89
#define STRINGID_PKMNSQUEEZEDBYBIND 90 #define STRINGID_PKMNSQUEEZEDBYBIND 90
#define STRINGID_PKMNTRAPPEDINVORTEX 91 #define STRINGID_PKMNTRAPPEDINVORTEX 91
#define STRINGID_PKMNWRAPPEDBY 92 #define STRINGID_PKMNWRAPPEDBY 92
#define STRINGID_PKMNCLAMPED 93 #define STRINGID_PKMNCLAMPED 93
#define STRINGID_PKMNHURTBY 94 #define STRINGID_PKMNHURTBY 94
#define STRINGID_PKMNFREEDFROM 95 #define STRINGID_PKMNFREEDFROM 95
#define STRINGID_PKMNCRASHED 96 #define STRINGID_PKMNCRASHED 96
#define STRINGID_PKMNSHROUDEDINMIST 97 #define STRINGID_PKMNSHROUDEDINMIST 97
#define STRINGID_PKMNPROTECTEDBYMIST 98 #define STRINGID_PKMNPROTECTEDBYMIST 98
#define STRINGID_PKMNGETTINGPUMPED 99 #define STRINGID_PKMNGETTINGPUMPED 99
#define STRINGID_PKMNHITWITHRECOIL 100 #define STRINGID_PKMNHITWITHRECOIL 100
#define STRINGID_PKMNPROTECTEDITSELF2 101 #define STRINGID_PKMNPROTECTEDITSELF2 101
#define STRINGID_PKMNBUFFETEDBYSANDSTORM 102 #define STRINGID_PKMNBUFFETEDBYSANDSTORM 102
#define STRINGID_PKMNPELTEDBYHAIL 103 #define STRINGID_PKMNPELTEDBYHAIL 103
#define STRINGID_PKMNSEEDED 104 #define STRINGID_PKMNSEEDED 104
#define STRINGID_PKMNEVADEDATTACK 105 #define STRINGID_PKMNEVADEDATTACK 105
#define STRINGID_PKMNSAPPEDBYLEECHSEED 106 #define STRINGID_PKMNSAPPEDBYLEECHSEED 106
#define STRINGID_PKMNFASTASLEEP 107 #define STRINGID_PKMNFASTASLEEP 107
#define STRINGID_PKMNWOKEUP 108 #define STRINGID_PKMNWOKEUP 108
#define STRINGID_PKMNUPROARKEPTAWAKE 109 #define STRINGID_PKMNUPROARKEPTAWAKE 109
#define STRINGID_PKMNWOKEUPINUPROAR 110 #define STRINGID_PKMNWOKEUPINUPROAR 110
#define STRINGID_PKMNCAUSEDUPROAR 111 #define STRINGID_PKMNCAUSEDUPROAR 111
#define STRINGID_PKMNMAKINGUPROAR 112 #define STRINGID_PKMNMAKINGUPROAR 112
#define STRINGID_PKMNCALMEDDOWN 113 #define STRINGID_PKMNCALMEDDOWN 113
#define STRINGID_PKMNCANTSLEEPINUPROAR 114 #define STRINGID_PKMNCANTSLEEPINUPROAR 114
#define STRINGID_PKMNSTOCKPILED 115 #define STRINGID_PKMNSTOCKPILED 115
#define STRINGID_PKMNCANTSTOCKPILE 116 #define STRINGID_PKMNCANTSTOCKPILE 116
#define STRINGID_PKMNCANTSLEEPINUPROAR2 117 #define STRINGID_PKMNCANTSLEEPINUPROAR2 117
#define STRINGID_UPROARKEPTPKMNAWAKE 118 #define STRINGID_UPROARKEPTPKMNAWAKE 118
#define STRINGID_PKMNSTAYEDAWAKEUSING 119 #define STRINGID_PKMNSTAYEDAWAKEUSING 119
#define STRINGID_PKMNSTORINGENERGY 120 #define STRINGID_PKMNSTORINGENERGY 120
#define STRINGID_PKMNUNLEASHEDENERGY 121 #define STRINGID_PKMNUNLEASHEDENERGY 121
#define STRINGID_PKMNFATIGUECONFUSION 122 #define STRINGID_PKMNFATIGUECONFUSION 122
#define STRINGID_PKMNPICKEDUPITEM 123 #define STRINGID_PKMNPICKEDUPITEM 123
#define STRINGID_PKMNUNAFFECTED 124 #define STRINGID_PKMNUNAFFECTED 124
#define STRINGID_PKMNTRANSFORMEDINTO 125 #define STRINGID_PKMNTRANSFORMEDINTO 125
#define STRINGID_PKMNMADESUBSTITUTE 126 #define STRINGID_PKMNMADESUBSTITUTE 126
#define STRINGID_PKMNHASSUBSTITUTE 127 #define STRINGID_PKMNHASSUBSTITUTE 127
#define STRINGID_SUBSTITUTEDAMAGED 128 #define STRINGID_SUBSTITUTEDAMAGED 128
#define STRINGID_PKMNSUBSTITUTEFADED 129 #define STRINGID_PKMNSUBSTITUTEFADED 129
#define STRINGID_PKMNMUSTRECHARGE 130 #define STRINGID_PKMNMUSTRECHARGE 130
#define STRINGID_PKMNRAGEBUILDING 131 #define STRINGID_PKMNRAGEBUILDING 131
#define STRINGID_PKMNMOVEWASDISABLED 132 #define STRINGID_PKMNMOVEWASDISABLED 132
#define STRINGID_PKMNMOVEISDISABLED 133 #define STRINGID_PKMNMOVEISDISABLED 133
#define STRINGID_PKMNMOVEDISABLEDNOMORE 134 #define STRINGID_PKMNMOVEDISABLEDNOMORE 134
#define STRINGID_PKMNGOTENCORE 135 #define STRINGID_PKMNGOTENCORE 135
#define STRINGID_PKMNENCOREENDED 136 #define STRINGID_PKMNENCOREENDED 136
#define STRINGID_PKMNTOOKAIM 137 #define STRINGID_PKMNTOOKAIM 137
#define STRINGID_PKMNSKETCHEDMOVE 138 #define STRINGID_PKMNSKETCHEDMOVE 138
#define STRINGID_PKMNTRYINGTOTAKEFOE 139 #define STRINGID_PKMNTRYINGTOTAKEFOE 139
#define STRINGID_PKMNTOOKFOE 140 #define STRINGID_PKMNTOOKFOE 140
#define STRINGID_PKMNREDUCEDPP 141 #define STRINGID_PKMNREDUCEDPP 141
#define STRINGID_PKMNSTOLEITEM 142 #define STRINGID_PKMNSTOLEITEM 142
#define STRINGID_TARGETCANTESCAPENOW 143 #define STRINGID_TARGETCANTESCAPENOW 143
#define STRINGID_PKMNFELLINTONIGHTMARE 144 #define STRINGID_PKMNFELLINTONIGHTMARE 144
#define STRINGID_PKMNLOCKEDINNIGHTMARE 145 #define STRINGID_PKMNLOCKEDINNIGHTMARE 145
#define STRINGID_PKMNLAIDCURSE 146 #define STRINGID_PKMNLAIDCURSE 146
#define STRINGID_PKMNAFFLICTEDBYCURSE 147 #define STRINGID_PKMNAFFLICTEDBYCURSE 147
#define STRINGID_SPIKESSCATTERED 148 #define STRINGID_SPIKESSCATTERED 148
#define STRINGID_PKMNHURTBYSPIKES 149 #define STRINGID_PKMNHURTBYSPIKES 149
#define STRINGID_PKMNIDENTIFIED 150 #define STRINGID_PKMNIDENTIFIED 150
#define STRINGID_PKMNPERISHCOUNTFELL 151 #define STRINGID_PKMNPERISHCOUNTFELL 151
#define STRINGID_PKMNBRACEDITSELF 152 #define STRINGID_PKMNBRACEDITSELF 152
#define STRINGID_PKMNENDUREDHIT 153 #define STRINGID_PKMNENDUREDHIT 153
#define STRINGID_MAGNITUDESTRENGTH 154 #define STRINGID_MAGNITUDESTRENGTH 154
#define STRINGID_PKMNCUTHPMAXEDATTACK 155 #define STRINGID_PKMNCUTHPMAXEDATTACK 155
#define STRINGID_PKMNCOPIEDSTATCHANGES 156 #define STRINGID_PKMNCOPIEDSTATCHANGES 156
#define STRINGID_PKMNGOTFREE 157 #define STRINGID_PKMNGOTFREE 157
#define STRINGID_PKMNSHEDLEECHSEED 158 #define STRINGID_PKMNSHEDLEECHSEED 158
#define STRINGID_PKMNBLEWAWAYSPIKES 159 #define STRINGID_PKMNBLEWAWAYSPIKES 159
#define STRINGID_PKMNFLEDFROMBATTLE 160 #define STRINGID_PKMNFLEDFROMBATTLE 160
#define STRINGID_PKMNFORESAWATTACK 161 #define STRINGID_PKMNFORESAWATTACK 161
#define STRINGID_PKMNTOOKATTACK 162 #define STRINGID_PKMNTOOKATTACK 162
#define STRINGID_PKMNATTACK 163 #define STRINGID_PKMNATTACK 163
#define STRINGID_PKMNCENTERATTENTION 164 #define STRINGID_PKMNCENTERATTENTION 164
#define STRINGID_PKMNCHARGINGPOWER 165 #define STRINGID_PKMNCHARGINGPOWER 165
#define STRINGID_NATUREPOWERTURNEDINTO 166 #define STRINGID_NATUREPOWERTURNEDINTO 166
#define STRINGID_PKMNSTATUSNORMAL 167 #define STRINGID_PKMNSTATUSNORMAL 167
#define STRINGID_PKMNHASNOMOVESLEFT 168 #define STRINGID_PKMNHASNOMOVESLEFT 168
#define STRINGID_PKMNSUBJECTEDTOTORMENT 169 #define STRINGID_PKMNSUBJECTEDTOTORMENT 169
#define STRINGID_PKMNCANTUSEMOVETORMENT 170 #define STRINGID_PKMNCANTUSEMOVETORMENT 170
#define STRINGID_PKMNTIGHTENINGFOCUS 171 #define STRINGID_PKMNTIGHTENINGFOCUS 171
#define STRINGID_PKMNFELLFORTAUNT 172 #define STRINGID_PKMNFELLFORTAUNT 172
#define STRINGID_PKMNCANTUSEMOVETAUNT 173 #define STRINGID_PKMNCANTUSEMOVETAUNT 173
#define STRINGID_PKMNREADYTOHELP 174 #define STRINGID_PKMNREADYTOHELP 174
#define STRINGID_PKMNSWITCHEDITEMS 175 #define STRINGID_PKMNSWITCHEDITEMS 175
#define STRINGID_PKMNCOPIEDFOE 176 #define STRINGID_PKMNCOPIEDFOE 176
#define STRINGID_PKMNMADEWISH 177 #define STRINGID_PKMNMADEWISH 177
#define STRINGID_PKMNWISHCAMETRUE 178 #define STRINGID_PKMNWISHCAMETRUE 178
#define STRINGID_PKMNPLANTEDROOTS 179 #define STRINGID_PKMNPLANTEDROOTS 179
#define STRINGID_PKMNABSORBEDNUTRIENTS 180 #define STRINGID_PKMNABSORBEDNUTRIENTS 180
#define STRINGID_PKMNANCHOREDITSELF 181 #define STRINGID_PKMNANCHOREDITSELF 181
#define STRINGID_PKMNWASMADEDROWSY 182 #define STRINGID_PKMNWASMADEDROWSY 182
#define STRINGID_PKMNKNOCKEDOFF 183 #define STRINGID_PKMNKNOCKEDOFF 183
#define STRINGID_PKMNSWAPPEDABILITIES 184 #define STRINGID_PKMNSWAPPEDABILITIES 184
#define STRINGID_PKMNSEALEDOPPONENTMOVE 185 #define STRINGID_PKMNSEALEDOPPONENTMOVE 185
#define STRINGID_PKMNCANTUSEMOVESEALED 186 #define STRINGID_PKMNCANTUSEMOVESEALED 186
#define STRINGID_PKMNWANTSGRUDGE 187 #define STRINGID_PKMNWANTSGRUDGE 187
#define STRINGID_PKMNLOSTPPGRUDGE 188 #define STRINGID_PKMNLOSTPPGRUDGE 188
#define STRINGID_PKMNSHROUDEDITSELF 189 #define STRINGID_PKMNSHROUDEDITSELF 189
#define STRINGID_PKMNMOVEBOUNCED 190 #define STRINGID_PKMNMOVEBOUNCED 190
#define STRINGID_PKMNWAITSFORTARGET 191 #define STRINGID_PKMNWAITSFORTARGET 191
#define STRINGID_PKMNSNATCHEDMOVE 192 #define STRINGID_PKMNSNATCHEDMOVE 192
#define STRINGID_PKMNMADEITRAIN 193 #define STRINGID_PKMNMADEITRAIN 193
#define STRINGID_PKMNRAISEDSPEED 194 #define STRINGID_PKMNRAISEDSPEED 194
#define STRINGID_PKMNPROTECTEDBY 195 #define STRINGID_PKMNPROTECTEDBY 195
#define STRINGID_PKMNPREVENTSUSAGE 196 #define STRINGID_PKMNPREVENTSUSAGE 196
#define STRINGID_PKMNRESTOREDHPUSING 197 #define STRINGID_PKMNRESTOREDHPUSING 197
#define STRINGID_PKMNCHANGEDTYPEWITH 198 #define STRINGID_PKMNCHANGEDTYPEWITH 198
#define STRINGID_PKMNPREVENTSPARALYSISWITH 199 #define STRINGID_PKMNPREVENTSPARALYSISWITH 199
#define STRINGID_PKMNPREVENTSROMANCEWITH 200 #define STRINGID_PKMNPREVENTSROMANCEWITH 200
#define STRINGID_PKMNPREVENTSPOISONINGWITH 201 #define STRINGID_PKMNPREVENTSPOISONINGWITH 201
#define STRINGID_PKMNPREVENTSCONFUSIONWITH 202 #define STRINGID_PKMNPREVENTSCONFUSIONWITH 202
#define STRINGID_PKMNRAISEDFIREPOWERWITH 203 #define STRINGID_PKMNRAISEDFIREPOWERWITH 203
#define STRINGID_PKMNANCHORSITSELFWITH 204 #define STRINGID_PKMNANCHORSITSELFWITH 204
#define STRINGID_PKMNCUTSATTACKWITH 205 #define STRINGID_PKMNCUTSATTACKWITH 205
#define STRINGID_PKMNPREVENTSSTATLOSSWITH 206 #define STRINGID_PKMNPREVENTSSTATLOSSWITH 206
#define STRINGID_PKMNHURTSWITH 207 #define STRINGID_PKMNHURTSWITH 207
#define STRINGID_PKMNTRACED 208 #define STRINGID_PKMNTRACED 208
#define STRINGID_STATSHARPLY 209 #define STRINGID_STATSHARPLY 209
#define STRINGID_STATROSE 210 #define STRINGID_STATROSE 210
#define STRINGID_STATHARSHLY 211 #define STRINGID_STATHARSHLY 211
#define STRINGID_STATFELL 212 #define STRINGID_STATFELL 212
#define STRINGID_PKMNSSTATCHANGED 213 #define STRINGID_PKMNSSTATCHANGED 213
#define STRINGID_PKMNSSTATCHANGED2 214 #define STRINGID_PKMNSSTATCHANGED2 214
#define STRINGID_PKMNSSTATCHANGED3 215 #define STRINGID_PKMNSSTATCHANGED3 215
#define STRINGID_PKMNSSTATCHANGED4 216 #define STRINGID_PKMNSSTATCHANGED4 216
#define STRINGID_CRITICALHIT 217 #define STRINGID_CRITICALHIT 217
#define STRINGID_ONEHITKO 218 #define STRINGID_ONEHITKO 218
#define STRINGID_123POOF 219 #define STRINGID_123POOF 219
#define STRINGID_ANDELLIPSIS 220 #define STRINGID_ANDELLIPSIS 220
#define STRINGID_NOTVERYEFFECTIVE 221 #define STRINGID_NOTVERYEFFECTIVE 221
#define STRINGID_SUPEREFFECTIVE 222 #define STRINGID_SUPEREFFECTIVE 222
#define STRINGID_GOTAWAYSAFELY 223 #define STRINGID_GOTAWAYSAFELY 223
#define STRINGID_WILDPKMNFLED 224 #define STRINGID_WILDPKMNFLED 224
#define STRINGID_NORUNNINGFROMTRAINERS 225 #define STRINGID_NORUNNINGFROMTRAINERS 225
#define STRINGID_CANTESCAPE 226 #define STRINGID_CANTESCAPE 226
#define STRINGID_DONTLEAVEBIRCH 227 #define STRINGID_DONTLEAVEBIRCH 227
#define STRINGID_BUTNOTHINGHAPPENED 228 #define STRINGID_BUTNOTHINGHAPPENED 228
#define STRINGID_BUTITFAILED 229 #define STRINGID_BUTITFAILED 229
#define STRINGID_ITHURTCONFUSION 230 #define STRINGID_ITHURTCONFUSION 230
#define STRINGID_MIRRORMOVEFAILED 231 #define STRINGID_MIRRORMOVEFAILED 231
#define STRINGID_STARTEDTORAIN 232 #define STRINGID_STARTEDTORAIN 232
#define STRINGID_DOWNPOURSTARTED 233 #define STRINGID_DOWNPOURSTARTED 233
#define STRINGID_RAINCONTINUES 234 #define STRINGID_RAINCONTINUES 234
#define STRINGID_DOWNPOURCONTINUES 235 #define STRINGID_DOWNPOURCONTINUES 235
#define STRINGID_RAINSTOPPED 236 #define STRINGID_RAINSTOPPED 236
#define STRINGID_SANDSTORMBREWED 237 #define STRINGID_SANDSTORMBREWED 237
#define STRINGID_SANDSTORMRAGES 238 #define STRINGID_SANDSTORMRAGES 238
#define STRINGID_SANDSTORMSUBSIDED 239 #define STRINGID_SANDSTORMSUBSIDED 239
#define STRINGID_SUNLIGHTGOTBRIGHT 240 #define STRINGID_SUNLIGHTGOTBRIGHT 240
#define STRINGID_SUNLIGHTSTRONG 241 #define STRINGID_SUNLIGHTSTRONG 241
#define STRINGID_SUNLIGHTFADED 242 #define STRINGID_SUNLIGHTFADED 242
#define STRINGID_STARTEDHAIL 243 #define STRINGID_STARTEDHAIL 243
#define STRINGID_HAILCONTINUES 244 #define STRINGID_HAILCONTINUES 244
#define STRINGID_HAILSTOPPED 245 #define STRINGID_HAILSTOPPED 245
#define STRINGID_FAILEDTOSPITUP 246 #define STRINGID_FAILEDTOSPITUP 246
#define STRINGID_FAILEDTOSWALLOW 247 #define STRINGID_FAILEDTOSWALLOW 247
#define STRINGID_WINDBECAMEHEATWAVE 248 #define STRINGID_WINDBECAMEHEATWAVE 248
#define STRINGID_STATCHANGESGONE 249 #define STRINGID_STATCHANGESGONE 249
#define STRINGID_COINSSCATTERED 250 #define STRINGID_COINSSCATTERED 250
#define STRINGID_TOOWEAKFORSUBSTITUTE 251 #define STRINGID_TOOWEAKFORSUBSTITUTE 251
#define STRINGID_SHAREDPAIN 252 #define STRINGID_SHAREDPAIN 252
#define STRINGID_BELLCHIMED 253 #define STRINGID_BELLCHIMED 253
#define STRINGID_FAINTINTHREE 254 #define STRINGID_FAINTINTHREE 254
#define STRINGID_NOPPLEFT 255 #define STRINGID_NOPPLEFT 255
#define STRINGID_BUTNOPPLEFT 256 #define STRINGID_BUTNOPPLEFT 256
#define STRINGID_PLAYERUSEDITEM 257 #define STRINGID_PLAYERUSEDITEM 257
#define STRINGID_WALLYUSEDITEM 258 #define STRINGID_WALLYUSEDITEM 258
#define STRINGID_TRAINERBLOCKEDBALL 259 #define STRINGID_TRAINERBLOCKEDBALL 259
#define STRINGID_DONTBEATHIEF 260 #define STRINGID_DONTBEATHIEF 260
#define STRINGID_ITDODGEDBALL 261 #define STRINGID_ITDODGEDBALL 261
#define STRINGID_YOUMISSEDPKMN 262 #define STRINGID_YOUMISSEDPKMN 262
#define STRINGID_PKMNBROKEFREE 263 #define STRINGID_PKMNBROKEFREE 263
#define STRINGID_ITAPPEAREDCAUGHT 264 #define STRINGID_ITAPPEAREDCAUGHT 264
#define STRINGID_AARGHALMOSTHADIT 265 #define STRINGID_AARGHALMOSTHADIT 265
#define STRINGID_SHOOTSOCLOSE 266 #define STRINGID_SHOOTSOCLOSE 266
#define STRINGID_GOTCHAPKMNCAUGHT 267 #define STRINGID_GOTCHAPKMNCAUGHT 267
#define STRINGID_GOTCHAPKMNCAUGHT2 268 #define STRINGID_GOTCHAPKMNCAUGHT2 268
#define STRINGID_GIVENICKNAMECAPTURED 269 #define STRINGID_GIVENICKNAMECAPTURED 269
#define STRINGID_PKMNSENTTOPC 270 #define STRINGID_PKMNSENTTOPC 270
#define STRINGID_PKMNDATAADDEDTODEX 271 #define STRINGID_PKMNDATAADDEDTODEX 271
#define STRINGID_ITISRAINING 272 #define STRINGID_ITISRAINING 272
#define STRINGID_SANDSTORMISRAGING 273 #define STRINGID_SANDSTORMISRAGING 273
#define STRINGID_CANTESCAPE2 274 #define STRINGID_CANTESCAPE2 274
#define STRINGID_PKMNIGNORESASLEEP 275 #define STRINGID_PKMNIGNORESASLEEP 275
#define STRINGID_PKMNIGNOREDORDERS 276 #define STRINGID_PKMNIGNOREDORDERS 276
#define STRINGID_PKMNBEGANTONAP 277 #define STRINGID_PKMNBEGANTONAP 277
#define STRINGID_PKMNLOAFING 278 #define STRINGID_PKMNLOAFING 278
#define STRINGID_PKMNWONTOBEY 279 #define STRINGID_PKMNWONTOBEY 279
#define STRINGID_PKMNTURNEDAWAY 280 #define STRINGID_PKMNTURNEDAWAY 280
#define STRINGID_PKMNPRETENDNOTNOTICE 281 #define STRINGID_PKMNPRETENDNOTNOTICE 281
#define STRINGID_ENEMYABOUTTOSWITCHPKMN 282 #define STRINGID_ENEMYABOUTTOSWITCHPKMN 282
#define STRINGID_CREPTCLOSER 283 #define STRINGID_CREPTCLOSER 283
#define STRINGID_CANTGETCLOSER 284 #define STRINGID_CANTGETCLOSER 284
#define STRINGID_PKMNWATCHINGCAREFULLY 285 #define STRINGID_PKMNWATCHINGCAREFULLY 285
#define STRINGID_PKMNCURIOUSABOUTX 286 #define STRINGID_PKMNCURIOUSABOUTX 286
#define STRINGID_PKMNENTHRALLEDBYX 287 #define STRINGID_PKMNENTHRALLEDBYX 287
#define STRINGID_PKMNIGNOREDX 288 #define STRINGID_PKMNIGNOREDX 288
#define STRINGID_THREWPOKEBLOCKATPKMN 289 #define STRINGID_THREWPOKEBLOCKATPKMN 289
#define STRINGID_OUTOFSAFARIBALLS 290 #define STRINGID_OUTOFSAFARIBALLS 290
#define STRINGID_PKMNSITEMCUREDPARALYSIS 291 #define STRINGID_PKMNSITEMCUREDPARALYSIS 291
#define STRINGID_PKMNSITEMCUREDPOISON 292 #define STRINGID_PKMNSITEMCUREDPOISON 292
#define STRINGID_PKMNSITEMHEALEDBURN 293 #define STRINGID_PKMNSITEMHEALEDBURN 293
#define STRINGID_PKMNSITEMDEFROSTEDIT 294 #define STRINGID_PKMNSITEMDEFROSTEDIT 294
#define STRINGID_PKMNSITEMWOKEIT 295 #define STRINGID_PKMNSITEMWOKEIT 295
#define STRINGID_PKMNSITEMSNAPPEDOUT 296 #define STRINGID_PKMNSITEMSNAPPEDOUT 296
#define STRINGID_PKMNSITEMCUREDPROBLEM 297 #define STRINGID_PKMNSITEMCUREDPROBLEM 297
#define STRINGID_PKMNSITEMRESTOREDHEALTH 298 #define STRINGID_PKMNSITEMRESTOREDHEALTH 298
#define STRINGID_PKMNSITEMRESTOREDPP 299 #define STRINGID_PKMNSITEMRESTOREDPP 299
#define STRINGID_PKMNSITEMRESTOREDSTATUS 300 #define STRINGID_PKMNSITEMRESTOREDSTATUS 300
#define STRINGID_PKMNSITEMRESTOREDHPALITTLE 301 #define STRINGID_PKMNSITEMRESTOREDHPALITTLE 301
#define STRINGID_ITEMALLOWSONLYYMOVE 302 #define STRINGID_ITEMALLOWSONLYYMOVE 302
#define STRINGID_PKMNHUNGONWITHX 303 #define STRINGID_PKMNHUNGONWITHX 303
#define STRINGID_EMPTYSTRING3 304 #define STRINGID_EMPTYSTRING3 304
#define STRINGID_PKMNSXPREVENTSBURNS 305 #define STRINGID_PKMNSXPREVENTSBURNS 305
#define STRINGID_PKMNSXBLOCKSY 306 #define STRINGID_PKMNSXBLOCKSY 306
#define STRINGID_PKMNSXRESTOREDHPALITTLE2 307 #define STRINGID_PKMNSXRESTOREDHPALITTLE2 307
#define STRINGID_PKMNSXWHIPPEDUPSANDSTORM 308 #define STRINGID_PKMNSXWHIPPEDUPSANDSTORM 308
#define STRINGID_PKMNSXPREVENTSYLOSS 309 #define STRINGID_PKMNSXPREVENTSYLOSS 309
#define STRINGID_PKMNSXINFATUATEDY 310 #define STRINGID_PKMNSXINFATUATEDY 310
#define STRINGID_PKMNSXMADEYINEFFECTIVE 311 #define STRINGID_PKMNSXMADEYINEFFECTIVE 311
#define STRINGID_PKMNSXCUREDYPROBLEM 312 #define STRINGID_PKMNSXCUREDYPROBLEM 312
#define STRINGID_ITSUCKEDLIQUIDOOZE 313 #define STRINGID_ITSUCKEDLIQUIDOOZE 313
#define STRINGID_PKMNTRANSFORMED 314 #define STRINGID_PKMNTRANSFORMED 314
#define STRINGID_ELECTRICITYWEAKENED 315 #define STRINGID_ELECTRICITYWEAKENED 315
#define STRINGID_FIREWEAKENED 316 #define STRINGID_FIREWEAKENED 316
#define STRINGID_PKMNHIDUNDERWATER 317 #define STRINGID_PKMNHIDUNDERWATER 317
#define STRINGID_PKMNSPRANGUP 318 #define STRINGID_PKMNSPRANGUP 318
#define STRINGID_HMMOVESCANTBEFORGOTTEN 319 #define STRINGID_HMMOVESCANTBEFORGOTTEN 319
#define STRINGID_XFOUNDONEY 320 #define STRINGID_XFOUNDONEY 320
#define STRINGID_PLAYERDEFEATEDTRAINER1 321 #define STRINGID_PLAYERDEFEATEDTRAINER1 321
#define STRINGID_SOOTHINGAROMA 322 #define STRINGID_SOOTHINGAROMA 322
#define STRINGID_ITEMSCANTBEUSEDNOW 323 #define STRINGID_ITEMSCANTBEUSEDNOW 323
#define STRINGID_FORXCOMMAYZ 324 #define STRINGID_FORXCOMMAYZ 324
#define STRINGID_USINGXTHEYOFZN 325 #define STRINGID_USINGXTHEYOFZN 325
#define STRINGID_PKMNUSEDXTOGETPUMPED 326 #define STRINGID_PKMNUSEDXTOGETPUMPED 326
#define STRINGID_PKMNSXMADEYUSELESS 327 #define STRINGID_PKMNSXMADEYUSELESS 327
#define STRINGID_PKMNTRAPPEDBYSANDTOMB 328 #define STRINGID_PKMNTRAPPEDBYSANDTOMB 328
#define STRINGID_EMPTYSTRING4 329 #define STRINGID_EMPTYSTRING4 329
#define STRINGID_ABOOSTED 330 #define STRINGID_ABOOSTED 330
#define STRINGID_PKMNSXINTENSIFIEDSUN 331 #define STRINGID_PKMNSXINTENSIFIEDSUN 331
#define STRINGID_PKMNMAKESGROUNDMISS 332 #define STRINGID_PKMNMAKESGROUNDMISS 332
#define STRINGID_YOUTHROWABALLNOWRIGHT 333 #define STRINGID_YOUTHROWABALLNOWRIGHT 333
#define STRINGID_PKMNSXTOOKATTACK 334 #define STRINGID_PKMNSXTOOKATTACK 334
#define STRINGID_PKMNCHOSEXASDESTINY 335 #define STRINGID_PKMNCHOSEXASDESTINY 335
#define STRINGID_PKMNLOSTFOCUS 336 #define STRINGID_PKMNLOSTFOCUS 336
#define STRINGID_USENEXTPKMN 337 #define STRINGID_USENEXTPKMN 337
#define STRINGID_PKMNFLEDUSINGITS 338 #define STRINGID_PKMNFLEDUSINGITS 338
#define STRINGID_PKMNFLEDUSING 339 #define STRINGID_PKMNFLEDUSING 339
#define STRINGID_PKMNWASDRAGGEDOUT 340 #define STRINGID_PKMNWASDRAGGEDOUT 340
#define STRINGID_PREVENTEDFROMWORKING 341 #define STRINGID_PREVENTEDFROMWORKING 341
#define STRINGID_PKMNSITEMNORMALIZEDSTATUS 342 #define STRINGID_PKMNSITEMNORMALIZEDSTATUS 342
#define STRINGID_TRAINER1USEDITEM 343 #define STRINGID_TRAINER1USEDITEM 343
#define STRINGID_BOXISFULL 344 #define STRINGID_BOXISFULL 344
#define STRINGID_PKMNAVOIDEDATTACK 345 #define STRINGID_PKMNAVOIDEDATTACK 345
#define STRINGID_PKMNSXMADEITINEFFECTIVE 346 #define STRINGID_PKMNSXMADEITINEFFECTIVE 346
#define STRINGID_PKMNSXPREVENTSFLINCHING 347 #define STRINGID_PKMNSXPREVENTSFLINCHING 347
#define STRINGID_PKMNALREADYHASBURN 348 #define STRINGID_PKMNALREADYHASBURN 348
#define STRINGID_STATSWONTDECREASE2 349 #define STRINGID_STATSWONTDECREASE2 349
#define STRINGID_PKMNSXBLOCKSY2 350 #define STRINGID_PKMNSXBLOCKSY2 350
#define STRINGID_PKMNSXWOREOFF 351 #define STRINGID_PKMNSXWOREOFF 351
#define STRINGID_PKMNRAISEDDEFALITTLE 352 #define STRINGID_PKMNRAISEDDEFALITTLE 352
#define STRINGID_PKMNRAISEDSPDEFALITTLE 353 #define STRINGID_PKMNRAISEDSPDEFALITTLE 353
#define STRINGID_THEWALLSHATTERED 354 #define STRINGID_THEWALLSHATTERED 354
#define STRINGID_PKMNSXPREVENTSYSZ 355 #define STRINGID_PKMNSXPREVENTSYSZ 355
#define STRINGID_PKMNSXCUREDITSYPROBLEM 356 #define STRINGID_PKMNSXCUREDITSYPROBLEM 356
#define STRINGID_ATTACKERCANTESCAPE 357 #define STRINGID_ATTACKERCANTESCAPE 357
#define STRINGID_PKMNOBTAINEDX 358 #define STRINGID_PKMNOBTAINEDX 358
#define STRINGID_PKMNOBTAINEDX2 359 #define STRINGID_PKMNOBTAINEDX2 359
#define STRINGID_PKMNOBTAINEDXYOBTAINEDZ 360 #define STRINGID_PKMNOBTAINEDXYOBTAINEDZ 360
#define STRINGID_BUTNOEFFECT 361 #define STRINGID_BUTNOEFFECT 361
#define STRINGID_PKMNSXHADNOEFFECTONY 362 #define STRINGID_PKMNSXHADNOEFFECTONY 362
#define STRINGID_TWOENEMIESDEFEATED 363 #define STRINGID_TWOENEMIESDEFEATED 363
#define STRINGID_TRAINER2LOSETEXT 364 #define STRINGID_TRAINER2LOSETEXT 364
#define STRINGID_PKMNINCAPABLEOFPOWER 365 #define STRINGID_PKMNINCAPABLEOFPOWER 365
#define STRINGID_GLINTAPPEARSINEYE 366 #define STRINGID_GLINTAPPEARSINEYE 366
#define STRINGID_PKMNGETTINGINTOPOSITION 367 #define STRINGID_PKMNGETTINGINTOPOSITION 367
#define STRINGID_PKMNBEGANGROWLINGDEEPLY 368 #define STRINGID_PKMNBEGANGROWLINGDEEPLY 368
#define STRINGID_PKMNEAGERFORMORE 369 #define STRINGID_PKMNEAGERFORMORE 369
#define STRINGID_DEFEATEDOPPONENTBYREFEREE 370 #define STRINGID_DEFEATEDOPPONENTBYREFEREE 370
#define STRINGID_LOSTTOOPPONENTBYREFEREE 371 #define STRINGID_LOSTTOOPPONENTBYREFEREE 371
#define STRINGID_TIEDOPPONENTBYREFEREE 372 #define STRINGID_TIEDOPPONENTBYREFEREE 372
#define STRINGID_QUESTIONFORFEITMATCH 373 #define STRINGID_QUESTIONFORFEITMATCH 373
#define STRINGID_FORFEITEDMATCH 374 #define STRINGID_FORFEITEDMATCH 374
#define STRINGID_PKMNTRANSFERREDSOMEONESPC 375 #define STRINGID_PKMNTRANSFERREDSOMEONESPC 375
#define STRINGID_PKMNTRANSFERREDLANETTESPC 376 #define STRINGID_PKMNTRANSFERREDLANETTESPC 376
#define STRINGID_PKMNBOXSOMEONESPCFULL 377 #define STRINGID_PKMNBOXSOMEONESPCFULL 377
#define STRINGID_PKMNBOXLANETTESPCFULL 378 #define STRINGID_PKMNBOXLANETTESPCFULL 378
#define STRINGID_TRAINER1WINTEXT 379 #define STRINGID_TRAINER1WINTEXT 379
#define STRINGID_TRAINER2WINTEXT 380 #define STRINGID_TRAINER2WINTEXT 380
#endif // GUARD_CONSTANTS_BATTLE_STRING_IDS_H #endif // GUARD_CONSTANTS_BATTLE_STRING_IDS_H

18
include/gba/isagbprint.h
View File

@ -5,7 +5,7 @@
#define AGBPrintInit() #define AGBPrintInit()
#define AGBPutc(cChr) #define AGBPutc(cChr)
#define AGBPrint(pBuf) #define AGBPrint(pBuf)
#define AGBPrintf(pBuf, ...) #define AGBPrintf(pBuf, ...)
#define AGBPrintFlush1Block() #define AGBPrintFlush1Block()
#define AGBPrintFlush() #define AGBPrintFlush()
#define AGBAssert(pFile, nLine, pExpression, nStopProgram) #define AGBAssert(pFile, nLine, pExpression, nStopProgram)
@ -21,30 +21,30 @@ void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopP
#undef AGB_ASSERT #undef AGB_ASSERT
#ifdef NDEBUG #ifdef NDEBUG
#define AGB_ASSERT(exp) #define AGB_ASSERT(exp)
#else #else
#define AGB_ASSERT(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 1); #define AGB_ASSERT(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 1);
#endif #endif
#undef AGB_WARNING #undef AGB_WARNING
#ifdef NDEBUG #ifdef NDEBUG
#define AGB_WARNING(exp) #define AGB_WARNING(exp)
#else #else
#define AGB_WARNING(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 0); #define AGB_WARNING(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 0);
#endif #endif
// for matching purposes // for matching purposes
#ifdef NDEBUG #ifdef NDEBUG
#define AGB_ASSERT_EX(exp, file, line) #define AGB_ASSERT_EX(exp, file, line)
#else #else
#define AGB_ASSERT_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 1); #define AGB_ASSERT_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 1);
#endif #endif
#ifdef NDEBUG #ifdef NDEBUG
#define AGB_WARNING_EX(exp, file, line) #define AGB_WARNING_EX(exp, file, line)
#else #else
#define AGB_WARNING_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 0); #define AGB_WARNING_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 0);
#endif #endif
#endif // GUARD_GBA_ISAGBPRINT_H #endif // GUARD_GBA_ISAGBPRINT_H

4
include/global.fieldmap.h
View File

@ -294,10 +294,10 @@ struct PlayerAvatar
/*0x09*/ u8 newDirBackup; // during bike movement, the new direction as opposed to player's direction is backed up here. /*0x09*/ u8 newDirBackup; // during bike movement, the new direction as opposed to player's direction is backed up here.
/*0x0A*/ u8 bikeFrameCounter; // on the mach bike, when this value is 1, the bike is moving but not accelerating yet for 1 tile. on the acro bike, this acts as a timer for acro bike. /*0x0A*/ u8 bikeFrameCounter; // on the mach bike, when this value is 1, the bike is moving but not accelerating yet for 1 tile. on the acro bike, this acts as a timer for acro bike.
/*0x0B*/ u8 bikeSpeed; /*0x0B*/ u8 bikeSpeed;
// acro bike only // acro bike only
/*0x0C*/ u32 directionHistory; // up/down/left/right history is stored in each nybble, but using the field directions and not the io inputs. /*0x0C*/ u32 directionHistory; // up/down/left/right history is stored in each nybble, but using the field directions and not the io inputs.
/*0x10*/ u32 abStartSelectHistory; // same as above but for A + B + start + select only /*0x10*/ u32 abStartSelectHistory; // same as above but for A + B + start + select only
// these two are timer history arrays which [0] is the active timer for acro bike. every element is backed up to the next element upon update. // these two are timer history arrays which [0] is the active timer for acro bike. every element is backed up to the next element upon update.
/*0x14*/ u8 dirTimerHistory[8]; /*0x14*/ u8 dirTimerHistory[8];
/*0x1C*/ u8 abStartSelectTimerHistory[8]; /*0x1C*/ u8 abStartSelectTimerHistory[8];
}; };

2
include/graphics.h
View File

@ -3360,7 +3360,7 @@ extern const u32 gRaySceneHushBg_Gfx[];
extern const u32 gRaySceneHushRing_Gfx[]; extern const u32 gRaySceneHushRing_Gfx[];
// Pokeballs // Pokeballs
extern const u32 gItemIcon_MasterBall[]; extern const u32 gItemIcon_MasterBall[];
extern const u32 gItemIconPalette_MasterBall[]; extern const u32 gItemIconPalette_MasterBall[];
extern const u32 gItemIcon_UltraBall[]; extern const u32 gItemIcon_UltraBall[];
extern const u32 gItemIconPalette_UltraBall[]; extern const u32 gItemIconPalette_UltraBall[];

8
include/pokemon_summary_screen.h
View File

@ -17,10 +17,10 @@ enum PokemonSummaryScreenMode
enum PokemonSummaryScreenPage enum PokemonSummaryScreenPage
{ {
PSS_PAGE_INFO, PSS_PAGE_INFO,
PSS_PAGE_SKILLS, PSS_PAGE_SKILLS,
PSS_PAGE_BATTLE_MOVES, PSS_PAGE_BATTLE_MOVES,
PSS_PAGE_CONTEST_MOVES, PSS_PAGE_CONTEST_MOVES,
}; };
#endif // GUARD_POKEMON_SUMMARY_SCREEN_H #endif // GUARD_POKEMON_SUMMARY_SCREEN_H

6
include/save.h
View File

@ -25,8 +25,8 @@ struct UnkSaveSection
struct SaveSectionOffsets struct SaveSectionOffsets
{ {
u16 toAdd; u16 toAdd;
u16 size; u16 size;
}; };
// Emerald changes this definition to be the sectors per slot. // Emerald changes this definition to be the sectors per slot.
@ -48,7 +48,7 @@ enum
SAVE_NORMAL, SAVE_NORMAL,
SAVE_LINK, SAVE_LINK,
//EREADER_SAVE, // deprecated in Emerald //EREADER_SAVE, // deprecated in Emerald
SAVE_LINK2, // unknown 2nd link save SAVE_LINK2, // unknown 2nd link save
SAVE_HALL_OF_FAME, SAVE_HALL_OF_FAME,
SAVE_OVERWRITE_DIFFERENT_FILE, SAVE_OVERWRITE_DIFFERENT_FILE,
SAVE_HALL_OF_FAME_ERASE_BEFORE // unused SAVE_HALL_OF_FAME_ERASE_BEFORE // unused

22
include/shop.h
View File

@ -17,7 +17,7 @@ enum
X_COORD, X_COORD,
Y_COORD, Y_COORD,
ANIM_NUM, ANIM_NUM,
LAYER_TYPE LAYER_TYPE
}; };
struct MartInfo struct MartInfo
@ -32,16 +32,16 @@ struct MartInfo
struct ShopData struct ShopData
{ {
/*0x0000*/ u16 tilemapBuffers[4][0x400]; /*0x0000*/ u16 tilemapBuffers[4][0x400];
/*0x2000*/ u32 totalCost; /*0x2000*/ u32 totalCost;
/*0x2004*/ u16 itemsShowed; /*0x2004*/ u16 itemsShowed;
/*0x2006*/ u16 selectedRow; /*0x2006*/ u16 selectedRow;
/*0x2008*/ u16 scrollOffset; /*0x2008*/ u16 scrollOffset;
/*0x200A*/ u8 maxQuantity; /*0x200A*/ u8 maxQuantity;
/*0x200B*/ u8 scrollIndicatorsTaskId; /*0x200B*/ u8 scrollIndicatorsTaskId;
/*0x200C*/ u8 iconSlot; /*0x200C*/ u8 iconSlot;
/*0x200D*/ u8 itemSpriteIds[2]; /*0x200D*/ u8 itemSpriteIds[2];
/*0x2010*/ s16 viewportObjects[16][5]; /*0x2010*/ s16 viewportObjects[16][5];
}; };
void CreatePokemartMenu(const u16 *); void CreatePokemartMenu(const u16 *);

2
ld_script.txt
View File

@ -43,7 +43,7 @@ SECTIONS {
{ {
asm/crt0.o(.text); asm/crt0.o(.text);
src/main.o(.text); src/main.o(.text);
src/malloc.o(.text); src/alloc.o(.text);
src/dma3_manager.o(.text); src/dma3_manager.o(.text);
src/gpu_regs.o(.text); src/gpu_regs.o(.text);
src/bg.o(.text); src/bg.o(.text);

210
src/alloc.c Normal file
View File

@ -0,0 +1,210 @@
#include "global.h"
static void *sHeapStart;
static u32 sHeapSize;
static u32 malloc_c_unused_0300000c; // needed to align dma3_manager.o(.bss)
#define MALLOC_SYSTEM_ID 0xA3A3
struct MemBlock {
// Whether this block is currently allocated.
bool16 flag;
// Magic number used for error checking. Should equal MALLOC_SYSTEM_ID.
u16 magic;
// Size of the block (not including this header struct).
u32 size;
// Previous block pointer. Equals sHeapStart if this is the first block.
struct MemBlock *prev;
// Next block pointer. Equals sHeapStart if this is the last block.
struct MemBlock *next;
// Data in the memory block. (Arrays of length 0 are a GNU extension.)
u8 data[0];
};
void PutMemBlockHeader(void *block, struct MemBlock *prev, struct MemBlock *next, u32 size)
{
struct MemBlock *header = (struct MemBlock *)block;
header->flag = FALSE;
header->magic = MALLOC_SYSTEM_ID;
header->size = size;
header->prev = prev;
header->next = next;
}
void PutFirstMemBlockHeader(void *block, u32 size)
{
PutMemBlockHeader(block, (struct MemBlock *)block, (struct MemBlock *)block, size - sizeof(struct MemBlock));
}
void *AllocInternal(void *heapStart, u32 size)
{
struct MemBlock *pos = (struct MemBlock *)heapStart;
struct MemBlock *head = pos;
struct MemBlock *splitBlock;
u32 foundBlockSize;
// Alignment
if (size & 3)
size = 4 * ((size / 4) + 1);
for (;;) {
// Loop through the blocks looking for unused block that's big enough.
if (!pos->flag) {
foundBlockSize = pos->size;
if (foundBlockSize >= size) {
if (foundBlockSize - size < 2 * sizeof(struct MemBlock)) {
// The block isn't much bigger than the requested size,
// so just use it.
pos->flag = TRUE;
} else {
// The block is significantly bigger than the requested
// size, so split the rest into a separate block.
foundBlockSize -= sizeof(struct MemBlock);
foundBlockSize -= size;
splitBlock = (struct MemBlock *)(pos->data + size);
pos->flag = TRUE;
pos->size = size;
PutMemBlockHeader(splitBlock, pos, pos->next, foundBlockSize);
pos->next = splitBlock;
if (splitBlock->next != head)
splitBlock->next->prev = splitBlock;
}
return pos->data;
}
}
if (pos->next == head)
return NULL;
pos = pos->next;
}
}
void FreeInternal(void *heapStart, void *pointer)
{
if (pointer) {
struct MemBlock *head = (struct MemBlock *)heapStart;
struct MemBlock *block = (struct MemBlock *)((u8 *)pointer - sizeof(struct MemBlock));
block->flag = FALSE;
// If the freed block isn't the last one, merge with the next block
// if it's not in use.
if (block->next != head) {
if (!block->next->flag) {
block->size += sizeof(struct MemBlock) + block->next->size;
block->next->magic = 0;
block->next = block->next->next;
if (block->next != head)
block->next->prev = block;
}
}
// If the freed block isn't the first one, merge with the previous block
// if it's not in use.
if (block != head) {
if (!block->prev->flag) {
block->prev->next = block->next;
if (block->next != head)
block->next->prev = block->prev;
block->magic = 0;
block->prev->size += sizeof(struct MemBlock) + block->size;
}
}
}
}
void *AllocZeroedInternal(void *heapStart, u32 size)
{
void *mem = AllocInternal(heapStart, size);
if (mem != NULL) {
if (size & 3)
size = 4 * ((size / 4) + 1);
CpuFill32(0, mem, size);
}
return mem;
}
bool32 CheckMemBlockInternal(void *heapStart, void *pointer)
{
struct MemBlock *head = (struct MemBlock *)heapStart;
struct MemBlock *block = (struct MemBlock *)((u8 *)pointer - sizeof(struct MemBlock));
if (block->magic != MALLOC_SYSTEM_ID)
return FALSE;
if (block->next->magic != MALLOC_SYSTEM_ID)
return FALSE;
if (block->next != head && block->next->prev != block)
return FALSE;
if (block->prev->magic != MALLOC_SYSTEM_ID)
return FALSE;
if (block->prev != head && block->prev->next != block)
return FALSE;
if (block->next != head && block->next != (struct MemBlock *)(block->data + block->size))
return FALSE;
return TRUE;
}
void InitHeap(void *heapStart, u32 heapSize)
{
sHeapStart = heapStart;
sHeapSize = heapSize;
PutFirstMemBlockHeader(heapStart, heapSize);
}
void *Alloc(u32 size)
{
AllocInternal(sHeapStart, size);
}
void *AllocZeroed(u32 size)
{
AllocZeroedInternal(sHeapStart, size);
}
void Free(void *pointer)
{
FreeInternal(sHeapStart, pointer);
}
bool32 CheckMemBlock(void *pointer)
{
return CheckMemBlockInternal(sHeapStart, pointer);
}
bool32 CheckHeap()
{
struct MemBlock *pos = (struct MemBlock *)sHeapStart;
do {
if (!CheckMemBlockInternal(sHeapStart, pos->data))
return FALSE;
pos = pos->next;
} while (pos != (struct MemBlock *)sHeapStart);
return TRUE;
}

320
src/apprentice.c
View File

@ -9,7 +9,7 @@
#include "item.h" #include "item.h"
#include "item_menu.h" #include "item_menu.h"
#include "main.h" #include "main.h"
#include "malloc.h" #include "alloc.h"
#include "menu.h" #include "menu.h"
#include "new_game.h" #include "new_game.h"
#include "party_menu.h" #include "party_menu.h"
@ -2047,172 +2047,172 @@ NAKED
static void sub_81A1224(void) static void sub_81A1224(void)
{ {
asm_unified("\n\ asm_unified("\n\
push {r4-r7,lr}\n\ push {r4-r7,lr}\n\
mov r7, r9\n\ mov r7, r9\n\
mov r6, r8\n\ mov r6, r8\n\
push {r6,r7}\n\ push {r6,r7}\n\
ldr r1, =gSaveBlock2Ptr\n\ ldr r1, =gSaveBlock2Ptr\n\
ldr r3, [r1]\n\ ldr r3, [r1]\n\
adds r0, r3, 0\n\ adds r0, r3, 0\n\
adds r0, 0xB1\n\ adds r0, 0xB1\n\
ldrb r0, [r0]\n\ ldrb r0, [r0]\n\
lsls r0, 26\n\ lsls r0, 26\n\
lsrs r0, 28\n\ lsrs r0, 28\n\
adds r7, r1, 0\n\ adds r7, r1, 0\n\
cmp r0, 0x2\n\ cmp r0, 0x2\n\
bhi _081A1242\n\ bhi _081A1242\n\
b _081A1362\n\ b _081A1362\n\
_081A1242:\n\ _081A1242:\n\
movs r5, 0\n\ movs r5, 0\n\
movs r2, 0\n\ movs r2, 0\n\
adds r0, r3, 0\n\ adds r0, r3, 0\n\
adds r0, 0xB8\n\ adds r0, 0xB8\n\
ldrb r0, [r0]\n\ ldrb r0, [r0]\n\
lsls r0, 30\n\ lsls r0, 30\n\
ldr r1, =gSpecialVar_0x8005\n\ ldr r1, =gSpecialVar_0x8005\n\
mov r12, r1\n\ mov r12, r1\n\
ldr r1, =gSpecialVar_Result\n\ ldr r1, =gSpecialVar_Result\n\
mov r8, r1\n\ mov r8, r1\n\
cmp r0, 0\n\ cmp r0, 0\n\
beq _081A127C\n\ beq _081A127C\n\
adds r3, r7, 0\n\ adds r3, r7, 0\n\
_081A125C:\n\ _081A125C:\n\
adds r0, r5, 0x1\n\ adds r0, r5, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r5, r0, 24\n\ lsrs r5, r0, 24\n\
adds r0, r2, 0x1\n\ adds r0, r2, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r2, r0, 24\n\ lsrs r2, r0, 24\n\
cmp r2, 0x8\n\ cmp r2, 0x8\n\
bhi _081A127C\n\ bhi _081A127C\n\
ldr r0, [r3]\n\ ldr r0, [r3]\n\
lsls r1, r2, 2\n\ lsls r1, r2, 2\n\
adds r0, r1\n\ adds r0, r1\n\
adds r0, 0xB8\n\ adds r0, 0xB8\n\
ldrb r0, [r0]\n\ ldrb r0, [r0]\n\
lsls r0, 30\n\ lsls r0, 30\n\
cmp r0, 0\n\ cmp r0, 0\n\
bne _081A125C\n\ bne _081A125C\n\
_081A127C:\n\ _081A127C:\n\
movs r4, 0\n\ movs r4, 0\n\
cmp r4, r5\n\ cmp r4, r5\n\
bcs _081A1322\n\ bcs _081A1322\n\
ldr r0, [r7]\n\ ldr r0, [r7]\n\
adds r0, 0xB1\n\ adds r0, 0xB1\n\
ldrb r0, [r0]\n\ ldrb r0, [r0]\n\
lsls r0, 26\n\ lsls r0, 26\n\
lsrs r0, 28\n\ lsrs r0, 28\n\
subs r0, 0x3\n\ subs r0, 0x3\n\
cmp r4, r0\n\ cmp r4, r0\n\
bge _081A1322\n\ bge _081A1322\n\
adds r6, r7, 0\n\ adds r6, r7, 0\n\
mov r9, r4\n\ mov r9, r4\n\
_081A1296:\n\ _081A1296:\n\
ldr r3, [r6]\n\ ldr r3, [r6]\n\
lsls r0, r4, 2\n\ lsls r0, r4, 2\n\
adds r2, r3, r0\n\ adds r2, r3, r0\n\
adds r0, r2, 0\n\ adds r0, r2, 0\n\
adds r0, 0xB8\n\ adds r0, 0xB8\n\
ldrb r1, [r0]\n\ ldrb r1, [r0]\n\
lsls r0, r1, 30\n\ lsls r0, r1, 30\n\
lsrs r0, 30\n\ lsrs r0, 30\n\
cmp r0, 0x1\n\ cmp r0, 0x1\n\
bne _081A1308\n\ bne _081A1308\n\
lsrs r0, r1, 6\n\ lsrs r0, r1, 6\n\
cmp r0, 0\n\ cmp r0, 0\n\
beq _081A1308\n\ beq _081A1308\n\
adds r0, r2, 0\n\ adds r0, r2, 0\n\
adds r0, 0xBA\n\ adds r0, 0xBA\n\
ldrh r0, [r0]\n\ ldrh r0, [r0]\n\
mov r2, r12\n\ mov r2, r12\n\
ldrh r2, [r2]\n\ ldrh r2, [r2]\n\
cmp r0, r2\n\ cmp r0, r2\n\
bne _081A1308\n\ bne _081A1308\n\
adds r0, r3, 0\n\ adds r0, r3, 0\n\
adds r0, 0xB1\n\ adds r0, 0xB1\n\
ldrb r0, [r0]\n\ ldrb r0, [r0]\n\
lsls r0, 26\n\ lsls r0, 26\n\
lsrs r0, 28\n\ lsrs r0, 28\n\
subs r0, 0x3\n\ subs r0, 0x3\n\
lsls r0, 2\n\ lsls r0, 2\n\
adds r0, r3, r0\n\ adds r0, r3, r0\n\
adds r0, 0xB8\n\ adds r0, 0xB8\n\
ldrb r2, [r0]\n\ ldrb r2, [r0]\n\
movs r1, 0x3F\n\ movs r1, 0x3F\n\
ands r1, r2\n\ ands r1, r2\n\
strb r1, [r0]\n\ strb r1, [r0]\n\
ldr r1, [r6]\n\ ldr r1, [r6]\n\
adds r0, r1, 0\n\ adds r0, r1, 0\n\
adds r0, 0xB1\n\ adds r0, 0xB1\n\
ldrb r0, [r0]\n\ ldrb r0, [r0]\n\
lsls r0, 26\n\ lsls r0, 26\n\
lsrs r0, 28\n\ lsrs r0, 28\n\
subs r0, 0x3\n\ subs r0, 0x3\n\
lsls r0, 2\n\ lsls r0, 2\n\
adds r1, r0\n\ adds r1, r0\n\
mov r2, r12\n\ mov r2, r12\n\
ldrh r0, [r2]\n\ ldrh r0, [r2]\n\
adds r1, 0xBA\n\ adds r1, 0xBA\n\
strh r0, [r1]\n\ strh r0, [r1]\n\
mov r1, r9\n\ mov r1, r9\n\
mov r0, r8\n\ mov r0, r8\n\
strh r1, [r0]\n\ strh r1, [r0]\n\
b _081A1362\n\ b _081A1362\n\
.pool\n\ .pool\n\
_081A1308:\n\ _081A1308:\n\
adds r0, r4, 0x1\n\ adds r0, r4, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r4, r0, 24\n\ lsrs r4, r0, 24\n\
cmp r4, r5\n\ cmp r4, r5\n\
bcs _081A1322\n\ bcs _081A1322\n\
ldr r0, [r6]\n\ ldr r0, [r6]\n\
adds r0, 0xB1\n\ adds r0, 0xB1\n\
ldrb r0, [r0]\n\ ldrb r0, [r0]\n\
lsls r0, 26\n\ lsls r0, 26\n\
lsrs r0, 28\n\ lsrs r0, 28\n\
subs r0, 0x3\n\ subs r0, 0x3\n\
cmp r4, r0\n\ cmp r4, r0\n\
blt _081A1296\n\ blt _081A1296\n\
_081A1322:\n\ _081A1322:\n\
ldr r2, [r7]\n\ ldr r2, [r7]\n\
adds r0, r2, 0\n\ adds r0, r2, 0\n\
adds r0, 0xB1\n\ adds r0, 0xB1\n\
ldrb r0, [r0]\n\ ldrb r0, [r0]\n\
lsls r0, 26\n\ lsls r0, 26\n\
lsrs r0, 28\n\ lsrs r0, 28\n\
subs r0, 0x3\n\ subs r0, 0x3\n\
lsls r0, 2\n\ lsls r0, 2\n\
adds r2, r0\n\ adds r2, r0\n\
adds r2, 0xB8\n\ adds r2, 0xB8\n\
ldrb r1, [r2]\n\ ldrb r1, [r2]\n\
movs r0, 0x3F\n\ movs r0, 0x3F\n\
ands r0, r1\n\ ands r0, r1\n\
movs r1, 0x40\n\ movs r1, 0x40\n\
orrs r0, r1\n\ orrs r0, r1\n\
strb r0, [r2]\n\ strb r0, [r2]\n\
ldr r1, [r7]\n\ ldr r1, [r7]\n\
adds r0, r1, 0\n\ adds r0, r1, 0\n\
adds r0, 0xB1\n\ adds r0, 0xB1\n\
ldrb r0, [r0]\n\ ldrb r0, [r0]\n\
lsls r0, 26\n\ lsls r0, 26\n\
lsrs r0, 28\n\ lsrs r0, 28\n\
subs r0, 0x3\n\ subs r0, 0x3\n\
lsls r0, 2\n\ lsls r0, 2\n\
adds r1, r0\n\ adds r1, r0\n\
mov r2, r12\n\ mov r2, r12\n\
ldrh r0, [r2]\n\ ldrh r0, [r2]\n\
adds r1, 0xBA\n\ adds r1, 0xBA\n\
strh r0, [r1]\n\ strh r0, [r1]\n\
movs r0, 0x1\n\ movs r0, 0x1\n\
mov r1, r8\n\ mov r1, r8\n\
strh r0, [r1]\n\ strh r0, [r1]\n\
_081A1362:\n\ _081A1362:\n\
pop {r3,r4}\n\ pop {r3,r4}\n\
mov r8, r3\n\ mov r8, r3\n\
mov r9, r4\n\ mov r9, r4\n\
pop {r4-r7}\n\ pop {r4-r7}\n\
pop {r0}\n\ pop {r0}\n\
bx r0\n\ bx r0\n\
"); ");
} }
#endif // NONMATCHING #endif // NONMATCHING

2
src/battle_ai_script_commands.c
View File

@ -463,7 +463,7 @@ static u8 ChooseMoveOrAction_Doubles(void)
{ {
if (i == sBattler_AI || gBattleMons[i].hp == 0) if (i == sBattler_AI || gBattleMons[i].hp == 0)
{ {
actionOrMoveIndex[i] = -1; actionOrMoveIndex[i] = 0xFF;
bestMovePointsForTarget[i] = -1; bestMovePointsForTarget[i] = -1;
} }
else else

96
src/battle_anim.c
View File

@ -1386,54 +1386,54 @@ const struct BattleAnimBackground gBattleAnimBackgroundTable[] =
static void (* const sScriptCmdTable[])(void) = static void (* const sScriptCmdTable[])(void) =
{ {
ScriptCmd_loadspritegfx, ScriptCmd_loadspritegfx,
ScriptCmd_unloadspritegfx, ScriptCmd_unloadspritegfx,
ScriptCmd_createsprite, ScriptCmd_createsprite,
ScriptCmd_createvisualtask, ScriptCmd_createvisualtask,
ScriptCmd_delay, ScriptCmd_delay,
ScriptCmd_waitforvisualfinish, ScriptCmd_waitforvisualfinish,
ScriptCmd_hang1, ScriptCmd_hang1,
ScriptCmd_hang2, ScriptCmd_hang2,
ScriptCmd_end, ScriptCmd_end,
ScriptCmd_playse, ScriptCmd_playse,
ScriptCmd_monbg, ScriptCmd_monbg,
ScriptCmd_clearmonbg, ScriptCmd_clearmonbg,
ScriptCmd_setalpha, ScriptCmd_setalpha,
ScriptCmd_blendoff, ScriptCmd_blendoff,
ScriptCmd_call, ScriptCmd_call,
ScriptCmd_return, ScriptCmd_return,
ScriptCmd_setarg, ScriptCmd_setarg,
ScriptCmd_choosetwoturnanim, ScriptCmd_choosetwoturnanim,
ScriptCmd_jumpifmoveturn, ScriptCmd_jumpifmoveturn,
ScriptCmd_goto, ScriptCmd_goto,
ScriptCmd_fadetobg, ScriptCmd_fadetobg,
ScriptCmd_restorebg, ScriptCmd_restorebg,
ScriptCmd_waitbgfadeout, ScriptCmd_waitbgfadeout,
ScriptCmd_waitbgfadein, ScriptCmd_waitbgfadein,
ScriptCmd_changebg, ScriptCmd_changebg,
ScriptCmd_playsewithpan, ScriptCmd_playsewithpan,
ScriptCmd_setpan, ScriptCmd_setpan,
ScriptCmd_panse_1B, ScriptCmd_panse_1B,
ScriptCmd_loopsewithpan, ScriptCmd_loopsewithpan,
ScriptCmd_waitplaysewithpan, ScriptCmd_waitplaysewithpan,
ScriptCmd_setbldcnt, ScriptCmd_setbldcnt,
ScriptCmd_createsoundtask, ScriptCmd_createsoundtask,
ScriptCmd_waitsound, ScriptCmd_waitsound,
ScriptCmd_jumpargeq, ScriptCmd_jumpargeq,
ScriptCmd_monbg_22, ScriptCmd_monbg_22,
ScriptCmd_clearmonbg_23, ScriptCmd_clearmonbg_23,
ScriptCmd_jumpifcontest, ScriptCmd_jumpifcontest,
ScriptCmd_fadetobgfromset, ScriptCmd_fadetobgfromset,
ScriptCmd_panse_26, ScriptCmd_panse_26,
ScriptCmd_panse_27, ScriptCmd_panse_27,
ScriptCmd_monbgprio_28, ScriptCmd_monbgprio_28,
ScriptCmd_monbgprio_29, ScriptCmd_monbgprio_29,
ScriptCmd_monbgprio_2A, ScriptCmd_monbgprio_2A,
ScriptCmd_invisible, ScriptCmd_invisible,
ScriptCmd_visible, ScriptCmd_visible,
ScriptCmd_doublebattle_2D, ScriptCmd_doublebattle_2D,
ScriptCmd_doublebattle_2E, ScriptCmd_doublebattle_2E,
ScriptCmd_stopsound ScriptCmd_stopsound
}; };
// code // code

2
src/battle_anim_80A5C6C.c
View File

@ -7,7 +7,7 @@
#include "decompress.h" #include "decompress.h"
#include "dma3.h" #include "dma3.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "malloc.h" #include "alloc.h"
#include "palette.h" #include "palette.h"
#include "pokemon_icon.h" #include "pokemon_icon.h"
#include "sprite.h" #include "sprite.h"

86
src/battle_anim_sound_tasks.c
View File

@ -389,50 +389,50 @@ void sub_8159308(u8 taskId)
NAKED NAKED
void sub_8159308(u8 taskId) void sub_8159308(u8 taskId)
{ {
asm_unified(" push {r4,r5,lr}\n\ asm_unified(" push {r4,r5,lr}\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r0, 24\n\ lsrs r0, 24\n\
adds r5, r0, 0\n\ adds r5, r0, 0\n\
ldr r1, =gTasks\n\ ldr r1, =gTasks\n\
lsls r0, r5, 2\n\ lsls r0, r5, 2\n\
adds r0, r5\n\ adds r0, r5\n\
lsls r0, 3\n\ lsls r0, 3\n\
adds r4, r0, r1\n\ adds r4, r0, r1\n\
ldrh r2, [r4, 0xE]\n\ ldrh r2, [r4, 0xE]\n\
ldrh r0, [r4, 0x1C]\n\ ldrh r0, [r4, 0x1C]\n\
adds r1, r0, 0x1\n\ adds r1, r0, 0x1\n\
strh r1, [r4, 0x1C]\n\ strh r1, [r4, 0x1C]\n\
lsls r0, 16\n\ lsls r0, 16\n\
asrs r0, 16\n\ asrs r0, 16\n\
movs r3, 0x12\n\ movs r3, 0x12\n\
ldrsh r1, [r4, r3]\n\ ldrsh r1, [r4, r3]\n\
cmp r0, r1\n\ cmp r0, r1\n\
bne _08159342\n\ bne _08159342\n\
movs r0, 0\n\ movs r0, 0\n\
strh r0, [r4, 0x1C]\n\ strh r0, [r4, 0x1C]\n\
ldrh r1, [r4, 0x1E]\n\ ldrh r1, [r4, 0x1E]\n\
adds r0, r2, r1\n\ adds r0, r2, r1\n\
strh r0, [r4, 0x1E]\n\ strh r0, [r4, 0x1E]\n\
movs r2, 0x1E\n\ movs r2, 0x1E\n\
ldrsh r0, [r4, r2]\n\ ldrsh r0, [r4, r2]\n\
bl KeepPanInRange\n\ bl KeepPanInRange\n\
strh r0, [r4, 0x1E]\n\ strh r0, [r4, 0x1E]\n\
_08159342:\n\ _08159342:\n\
ldr r1, =gUnknown_02038440\n\ ldr r1, =gUnknown_02038440\n\
ldrh r0, [r4, 0x1E]\n\ ldrh r0, [r4, 0x1E]\n\
strb r0, [r1]\n\ strb r0, [r1]\n\
movs r3, 0x1E\n\ movs r3, 0x1E\n\
ldrsh r1, [r4, r3]\n\ ldrsh r1, [r4, r3]\n\
movs r2, 0xC\n\ movs r2, 0xC\n\
ldrsh r0, [r4, r2]\n\ ldrsh r0, [r4, r2]\n\
cmp r1, r0\n\ cmp r1, r0\n\
bne _0815935A\n\ bne _0815935A\n\
adds r0, r5, 0\n\ adds r0, r5, 0\n\
bl DestroyAnimVisualTask\n\ bl DestroyAnimVisualTask\n\
_0815935A:\n\ _0815935A:\n\
pop {r4,r5}\n\ pop {r4,r5}\n\
pop {r0}\n\ pop {r0}\n\
bx r0\n\ bx r0\n\
.pool"); .pool");
} }
#endif #endif

2
src/battle_anim_utility_funcs.c
View File

@ -3,7 +3,7 @@
#include "contest.h" #include "contest.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "graphics.h" #include "graphics.h"
#include "malloc.h" #include "alloc.h"
#include "palette.h" #include "palette.h"
#include "sound.h" #include "sound.h"
#include "sprite.h" #include "sprite.h"

1208
src/battle_dome.c
View File

File diff suppressed because it is too large Load Diff

2
src/battle_factory_screen.c
View File

@ -10,7 +10,7 @@
#include "palette.h" #include "palette.h"
#include "task.h" #include "task.h"
#include "main.h" #include "main.h"
#include "malloc.h" #include "alloc.h"
#include "bg.h" #include "bg.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "string_util.h" #include "string_util.h"

2
src/battle_gfx_sfx_util.c
View File

@ -6,7 +6,7 @@
#include "constants/battle_anim.h" #include "constants/battle_anim.h"
#include "battle_interface.h" #include "battle_interface.h"
#include "main.h" #include "main.h"
#include "malloc.h" #include "alloc.h"
#include "graphics.h" #include "graphics.h"
#include "random.h" #include "random.h"
#include "util.h" #include "util.h"

420
src/battle_interface.c
View File

@ -543,11 +543,11 @@ enum
static const u16 sStatusIconColors[] = static const u16 sStatusIconColors[] =
{ {
RGB(24, 12, 24), // PAL_STATUS_PSN [PAL_STATUS_PSN] = RGB(24, 12, 24),
RGB(23, 23, 3), // PAL_STATUS_PAR [PAL_STATUS_PAR] = RGB(23, 23, 3),
RGB(20, 20, 17), // PAL_STATUS_SLP [PAL_STATUS_SLP] = RGB(20, 20, 17),
RGB(17, 22, 28), // PAL_STATUS_FRZ [PAL_STATUS_FRZ] = RGB(17, 22, 28),
RGB(28, 14, 10) // PAL_STATUS_BRN [PAL_STATUS_BRN] = RGB(28, 14, 10),
}; };
static const struct WindowTemplate sHealthboxWindowTemplate = {0, 0, 0, 8, 2, 0, 0}; // width = 8, height = 2 static const struct WindowTemplate sHealthboxWindowTemplate = {0, 0, 0, 8, 2, 0, 0}; // width = 8, height = 2
@ -647,225 +647,225 @@ NAKED
static void sub_8072308(s16 arg0, u16 *arg1, u8 arg2) static void sub_8072308(s16 arg0, u16 *arg1, u8 arg2)
{ {
asm(".syntax unified\n\ asm(".syntax unified\n\
push {r4-r7,lr}\n\ push {r4-r7,lr}\n\
mov r7, r10\n\ mov r7, r10\n\
mov r6, r9\n\ mov r6, r9\n\
mov r5, r8\n\ mov r5, r8\n\
push {r5-r7}\n\ push {r5-r7}\n\
sub sp, 0x4\n\ sub sp, 0x4\n\
adds r7, r1, 0\n\ adds r7, r1, 0\n\
lsls r0, 16\n\ lsls r0, 16\n\
lsrs r5, r0, 16\n\ lsrs r5, r0, 16\n\
lsls r2, 24\n\ lsls r2, 24\n\
lsrs r2, 24\n\ lsrs r2, 24\n\
mov r10, r2\n\ mov r10, r2\n\
movs r3, 0\n\ movs r3, 0\n\
movs r2, 0\n\ movs r2, 0\n\
_08072324:\n\ _08072324:\n\
lsls r0, r3, 24\n\ lsls r0, r3, 24\n\
asrs r0, 24\n\ asrs r0, 24\n\
mov r3, sp\n\ mov r3, sp\n\
adds r1, r3, r0\n\ adds r1, r3, r0\n\
strb r2, [r1]\n\ strb r2, [r1]\n\
adds r0, 0x1\n\ adds r0, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r3, r0, 24\n\ lsrs r3, r0, 24\n\
asrs r0, 24\n\ asrs r0, 24\n\
cmp r0, 0x3\n\ cmp r0, 0x3\n\
ble _08072324\n\ ble _08072324\n\
movs r3, 0x3\n\ movs r3, 0x3\n\
movs r0, 0x1\n\ movs r0, 0x1\n\
negs r0, r0\n\ negs r0, r0\n\
mov r9, r0\n\ mov r9, r0\n\
mov r8, sp\n\ mov r8, sp\n\
_08072344:\n\ _08072344:\n\
lsls r0, r5, 16\n\ lsls r0, r5, 16\n\
asrs r6, r0, 16\n\ asrs r6, r0, 16\n\
cmp r6, 0\n\ cmp r6, 0\n\
ble _08072372\n\ ble _08072372\n\
lsls r4, r3, 24\n\ lsls r4, r3, 24\n\
asrs r4, 24\n\ asrs r4, 24\n\
mov r1, sp\n\ mov r1, sp\n\
adds r5, r1, r4\n\ adds r5, r1, r4\n\
adds r0, r6, 0\n\ adds r0, r6, 0\n\
movs r1, 0xA\n\ movs r1, 0xA\n\
bl __modsi3\n\ bl __modsi3\n\
strb r0, [r5]\n\ strb r0, [r5]\n\
adds r0, r6, 0\n\ adds r0, r6, 0\n\
movs r1, 0xA\n\ movs r1, 0xA\n\
bl __divsi3\n\ bl __divsi3\n\
lsls r0, 16\n\ lsls r0, 16\n\
lsrs r5, r0, 16\n\ lsrs r5, r0, 16\n\
subs r4, 0x1\n\ subs r4, 0x1\n\
lsls r4, 24\n\ lsls r4, 24\n\
lsrs r3, r4, 24\n\ lsrs r3, r4, 24\n\
b _08072344\n\ b _08072344\n\
_08072372:\n\ _08072372:\n\
lsls r1, r3, 24\n\ lsls r1, r3, 24\n\
asrs r0, r1, 24\n\ asrs r0, r1, 24\n\
cmp r0, r9\n\ cmp r0, r9\n\
ble _08072396\n\ ble _08072396\n\
movs r4, 0xFF\n\ movs r4, 0xFF\n\
movs r3, 0x1\n\ movs r3, 0x1\n\
negs r3, r3\n\ negs r3, r3\n\
_08072380:\n\ _08072380:\n\
asrs r2, r1, 24\n\ asrs r2, r1, 24\n\
mov r5, sp\n\ mov r5, sp\n\
adds r1, r5, r2\n\ adds r1, r5, r2\n\
ldrb r0, [r1]\n\ ldrb r0, [r1]\n\
orrs r0, r4\n\ orrs r0, r4\n\
strb r0, [r1]\n\ strb r0, [r1]\n\
subs r2, 0x1\n\ subs r2, 0x1\n\
lsls r1, r2, 24\n\ lsls r1, r2, 24\n\
asrs r0, r1, 24\n\ asrs r0, r1, 24\n\
cmp r0, r3\n\ cmp r0, r3\n\
bgt _08072380\n\ bgt _08072380\n\
_08072396:\n\ _08072396:\n\
mov r1, r8\n\ mov r1, r8\n\
ldrb r0, [r1, 0x3]\n\ ldrb r0, [r1, 0x3]\n\
cmp r0, 0xFF\n\ cmp r0, 0xFF\n\
bne _080723A2\n\ bne _080723A2\n\
movs r0, 0\n\ movs r0, 0\n\
strb r0, [r1, 0x3]\n\ strb r0, [r1, 0x3]\n\
_080723A2:\n\ _080723A2:\n\
mov r2, r10\n\ mov r2, r10\n\
cmp r2, 0\n\ cmp r2, 0\n\
bne _08072432\n\ bne _08072432\n\
movs r3, 0\n\ movs r3, 0\n\
movs r1, 0\n\ movs r1, 0\n\
movs r6, 0xFC\n\ movs r6, 0xFC\n\
lsls r6, 8\n\ lsls r6, 8\n\
movs r5, 0x1E\n\ movs r5, 0x1E\n\
mov r12, r5\n\ mov r12, r5\n\
_080723B4:\n\ _080723B4:\n\
lsls r1, 24\n\ lsls r1, 24\n\
asrs r2, r1, 24\n\ asrs r2, r1, 24\n\
mov r0, sp\n\ mov r0, sp\n\
adds r5, r0, r2\n\ adds r5, r0, r2\n\
ldrb r0, [r5]\n\ ldrb r0, [r5]\n\
mov r8, r1\n\ mov r8, r1\n\
cmp r0, 0xFF\n\ cmp r0, 0xFF\n\
bne _080723EA\n\ bne _080723EA\n\
lsls r1, r2, 1\n\ lsls r1, r2, 1\n\
adds r1, r7\n\ adds r1, r7\n\
ldrh r2, [r1]\n\ ldrh r2, [r1]\n\
adds r0, r6, 0\n\ adds r0, r6, 0\n\
ands r0, r2\n\ ands r0, r2\n\
mov r2, r12\n\ mov r2, r12\n\
orrs r0, r2\n\ orrs r0, r2\n\
strh r0, [r1]\n\ strh r0, [r1]\n\
lsls r3, 24\n\ lsls r3, 24\n\
asrs r1, r3, 23\n\ asrs r1, r3, 23\n\
adds r1, r7\n\ adds r1, r7\n\
adds r1, 0x40\n\ adds r1, 0x40\n\
ldrh r2, [r1]\n\ ldrh r2, [r1]\n\
adds r0, r6, 0\n\ adds r0, r6, 0\n\
ands r0, r2\n\ ands r0, r2\n\
mov r5, r12\n\ mov r5, r12\n\
orrs r0, r5\n\ orrs r0, r5\n\
strh r0, [r1]\n\ strh r0, [r1]\n\
b _0807241A\n\ b _0807241A\n\
_080723EA:\n\ _080723EA:\n\
lsls r2, 1\n\ lsls r2, 1\n\
adds r2, r7\n\ adds r2, r7\n\
ldrh r0, [r2]\n\ ldrh r0, [r2]\n\
adds r1, r6, 0\n\ adds r1, r6, 0\n\
ands r1, r0\n\ ands r1, r0\n\
ldrb r0, [r5]\n\ ldrb r0, [r5]\n\
adds r0, 0x14\n\ adds r0, 0x14\n\
orrs r1, r0\n\ orrs r1, r0\n\
strh r1, [r2]\n\ strh r1, [r2]\n\
lsls r4, r3, 24\n\ lsls r4, r3, 24\n\
asrs r3, r4, 24\n\ asrs r3, r4, 24\n\
lsls r2, r3, 1\n\ lsls r2, r3, 1\n\
adds r2, r7\n\ adds r2, r7\n\
adds r2, 0x40\n\ adds r2, 0x40\n\
ldrh r0, [r2]\n\ ldrh r0, [r2]\n\
adds r1, r6, 0\n\ adds r1, r6, 0\n\
ands r1, r0\n\ ands r1, r0\n\
mov r5, sp\n\ mov r5, sp\n\
adds r0, r5, r3\n\ adds r0, r5, r3\n\
ldrb r0, [r0]\n\ ldrb r0, [r0]\n\
adds r0, 0x34\n\ adds r0, 0x34\n\
orrs r1, r0\n\ orrs r1, r0\n\
strh r1, [r2]\n\ strh r1, [r2]\n\
adds r3, r4, 0\n\ adds r3, r4, 0\n\
_0807241A:\n\ _0807241A:\n\
movs r0, 0x80\n\ movs r0, 0x80\n\
lsls r0, 17\n\ lsls r0, 17\n\
add r0, r8\n\ add r0, r8\n\
lsrs r1, r0, 24\n\ lsrs r1, r0, 24\n\
movs r2, 0x80\n\ movs r2, 0x80\n\
lsls r2, 17\n\ lsls r2, 17\n\
adds r0, r3, r2\n\ adds r0, r3, r2\n\
lsrs r3, r0, 24\n\ lsrs r3, r0, 24\n\
asrs r0, 24\n\ asrs r0, 24\n\
cmp r0, 0x3\n\ cmp r0, 0x3\n\
ble _080723B4\n\ ble _080723B4\n\
b _08072496\n\ b _08072496\n\
_08072432:\n\ _08072432:\n\
movs r3, 0\n\ movs r3, 0\n\
movs r4, 0xFC\n\ movs r4, 0xFC\n\
lsls r4, 8\n\ lsls r4, 8\n\
movs r6, 0x1E\n\ movs r6, 0x1E\n\
_0807243A:\n\ _0807243A:\n\
lsls r1, r3, 24\n\ lsls r1, r3, 24\n\
asrs r2, r1, 24\n\ asrs r2, r1, 24\n\
mov r3, sp\n\ mov r3, sp\n\
adds r5, r3, r2\n\ adds r5, r3, r2\n\
ldrb r0, [r5]\n\ ldrb r0, [r5]\n\
adds r3, r1, 0\n\ adds r3, r1, 0\n\
cmp r0, 0xFF\n\ cmp r0, 0xFF\n\
bne _08072466\n\ bne _08072466\n\
lsls r1, r2, 1\n\ lsls r1, r2, 1\n\
adds r1, r7\n\ adds r1, r7\n\
ldrh r2, [r1]\n\ ldrh r2, [r1]\n\
adds r0, r4, 0\n\ adds r0, r4, 0\n\
ands r0, r2\n\ ands r0, r2\n\
orrs r0, r6\n\ orrs r0, r6\n\
strh r0, [r1]\n\ strh r0, [r1]\n\
adds r1, 0x40\n\ adds r1, 0x40\n\
ldrh r2, [r1]\n\ ldrh r2, [r1]\n\
adds r0, r4, 0\n\ adds r0, r4, 0\n\
ands r0, r2\n\ ands r0, r2\n\
orrs r0, r6\n\ orrs r0, r6\n\
strh r0, [r1]\n\ strh r0, [r1]\n\
b _08072488\n\ b _08072488\n\
_08072466:\n\ _08072466:\n\
lsls r2, 1\n\ lsls r2, 1\n\
adds r2, r7\n\ adds r2, r7\n\
ldrh r0, [r2]\n\ ldrh r0, [r2]\n\
adds r1, r4, 0\n\ adds r1, r4, 0\n\
ands r1, r0\n\ ands r1, r0\n\
ldrb r0, [r5]\n\ ldrb r0, [r5]\n\
adds r0, 0x14\n\ adds r0, 0x14\n\
orrs r1, r0\n\ orrs r1, r0\n\
strh r1, [r2]\n\ strh r1, [r2]\n\
adds r2, 0x40\n\ adds r2, 0x40\n\
ldrh r0, [r2]\n\ ldrh r0, [r2]\n\
adds r1, r4, 0\n\ adds r1, r4, 0\n\
ands r1, r0\n\ ands r1, r0\n\
ldrb r0, [r5]\n\ ldrb r0, [r5]\n\
adds r0, 0x34\n\ adds r0, 0x34\n\
orrs r1, r0\n\ orrs r1, r0\n\
strh r1, [r2]\n\ strh r1, [r2]\n\
_08072488:\n\ _08072488:\n\
movs r5, 0x80\n\ movs r5, 0x80\n\
lsls r5, 17\n\ lsls r5, 17\n\
adds r0, r3, r5\n\ adds r0, r3, r5\n\
lsrs r3, r0, 24\n\ lsrs r3, r0, 24\n\
asrs r0, 24\n\ asrs r0, 24\n\
cmp r0, 0x3\n\ cmp r0, 0x3\n\
ble _0807243A\n\ ble _0807243A\n\
_08072496:\n\ _08072496:\n\
add sp, 0x4\n\ add sp, 0x4\n\
pop {r3-r5}\n\ pop {r3-r5}\n\
mov r8, r3\n\ mov r8, r3\n\
mov r9, r4\n\ mov r9, r4\n\
mov r10, r5\n\ mov r10, r5\n\
pop {r4-r7}\n\ pop {r4-r7}\n\
pop {r0}\n\ pop {r0}\n\
bx r0\n\ bx r0\n\
.syntax divided"); .syntax divided");
} }

202
src/battle_main.c
View File

@ -23,7 +23,7 @@
#include "link_rfu.h" #include "link_rfu.h"
#include "load_save.h" #include "load_save.h"
#include "main.h" #include "main.h"
#include "malloc.h" #include "alloc.h"
#include "m4a.h" #include "m4a.h"
#include "palette.h" #include "palette.h"
#include "party_menu.h" #include "party_menu.h"
@ -507,35 +507,35 @@ const struct TrainerMoney gTrainerMoneyTable[] =
static void (* const sTurnActionsFuncsTable[])(void) = static void (* const sTurnActionsFuncsTable[])(void) =
{ {
HandleAction_UseMove, // B_ACTION_USE_MOVE [B_ACTION_USE_MOVE] = HandleAction_UseMove,
HandleAction_UseItem, // B_ACTION_USE_ITEM [B_ACTION_USE_ITEM] = HandleAction_UseItem,
HandleAction_Switch, // B_ACTION_SWITCH [B_ACTION_SWITCH] = HandleAction_Switch,
HandleAction_Run, // B_ACTION_RUN [B_ACTION_RUN] = HandleAction_Run,
HandleAction_WatchesCarefully, // B_ACTION_SAFARI_WATCH_CAREFULLY [B_ACTION_SAFARI_WATCH_CAREFULLY] = HandleAction_WatchesCarefully,
HandleAction_SafariZoneBallThrow, // B_ACTION_SAFARI_BALL [B_ACTION_SAFARI_BALL] = HandleAction_SafariZoneBallThrow,
HandleAction_ThrowPokeblock, // B_ACTION_SAFARI_POKEBLOCK [B_ACTION_SAFARI_POKEBLOCK] = HandleAction_ThrowPokeblock,
HandleAction_GoNear, // B_ACTION_SAFARI_GO_NEAR [B_ACTION_SAFARI_GO_NEAR] = HandleAction_GoNear,
HandleAction_SafariZoneRun, // B_ACTION_SAFARI_RUN [B_ACTION_SAFARI_RUN] = HandleAction_SafariZoneRun,
HandleAction_WallyBallThrow, // B_ACTION_WALLY_THROW [B_ACTION_WALLY_THROW] = HandleAction_WallyBallThrow,
HandleAction_RunBattleScript, // B_ACTION_EXEC_SCRIPT [B_ACTION_EXEC_SCRIPT] = HandleAction_RunBattleScript,
HandleAction_Action11, // not sure about this one [11] = HandleAction_Action11, // not sure about this one
HandleAction_ActionFinished, // B_ACTION_FINISHED [B_ACTION_FINISHED] = HandleAction_ActionFinished,
HandleAction_NothingIsFainted, // B_ACTION_NOTHING_FAINTED [B_ACTION_NOTHING_FAINTED] = HandleAction_NothingIsFainted,
}; };
static void (* const sEndTurnFuncsTable[])(void) = static void (* const sEndTurnFuncsTable[])(void) =
{ {
HandleEndTurn_ContinueBattle, // battle outcome 0 [0] = HandleEndTurn_ContinueBattle, //B_OUTCOME_NONE?
HandleEndTurn_BattleWon, // B_OUTCOME_WON [B_OUTCOME_WON] = HandleEndTurn_BattleWon,
HandleEndTurn_BattleLost, // B_OUTCOME_LOST [B_OUTCOME_LOST] = HandleEndTurn_BattleLost,
HandleEndTurn_BattleLost, // B_OUTCOME_DREW [B_OUTCOME_DREW] = HandleEndTurn_BattleLost,
HandleEndTurn_RanFromBattle, // B_OUTCOME_RAN [B_OUTCOME_RAN] = HandleEndTurn_RanFromBattle,
HandleEndTurn_FinishBattle, // B_OUTCOME_PLAYER_TELEPORTED [B_OUTCOME_PLAYER_TELEPORTED] = HandleEndTurn_FinishBattle,
HandleEndTurn_MonFled, // B_OUTCOME_MON_FLED [B_OUTCOME_MON_FLED] = HandleEndTurn_MonFled,
HandleEndTurn_FinishBattle, // B_OUTCOME_CAUGHT [B_OUTCOME_CAUGHT] = HandleEndTurn_FinishBattle,
HandleEndTurn_FinishBattle, // B_OUTCOME_NO_SAFARI_BALLS [B_OUTCOME_NO_SAFARI_BALLS] = HandleEndTurn_FinishBattle,
HandleEndTurn_FinishBattle, // B_OUTCOME_FORFEITED [B_OUTCOME_FORFEITED] = HandleEndTurn_FinishBattle,
HandleEndTurn_FinishBattle, // B_OUTCOME_MON_TELEPORTED [B_OUTCOME_MON_TELEPORTED] = HandleEndTurn_FinishBattle,
}; };
const u8 gStatusConditionString_PoisonJpn[8] = _("どく$$$$$"); const u8 gStatusConditionString_PoisonJpn[8] = _("どく$$$$$");
@ -3610,85 +3610,85 @@ NAKED
static void BattleIntroOpponent1SendsOutMonAnimation(void) static void BattleIntroOpponent1SendsOutMonAnimation(void)
{ {
asm(".syntax unified\n\ asm(".syntax unified\n\
push {r4-r6,lr}\n\ push {r4-r6,lr}\n\
ldr r0, =gBattleTypeFlags\n\ ldr r0, =gBattleTypeFlags\n\
ldr r2, [r0]\n\ ldr r2, [r0]\n\
movs r0, 0x80\n\ movs r0, 0x80\n\
lsls r0, 17\n\ lsls r0, 17\n\
ands r0, r2\n\ ands r0, r2\n\
cmp r0, 0\n\ cmp r0, 0\n\
beq _0803B298\n\ beq _0803B298\n\
movs r0, 0x80\n\ movs r0, 0x80\n\
lsls r0, 18\n\ lsls r0, 18\n\
ands r0, r2\n\ ands r0, r2\n\
cmp r0, 0\n\ cmp r0, 0\n\
beq _0803B298\n\ beq _0803B298\n\
movs r1, 0x80\n\ movs r1, 0x80\n\
lsls r1, 24\n\ lsls r1, 24\n\
ands r1, r2\n\ ands r1, r2\n\
negs r0, r1\n\ negs r0, r1\n\
orrs r0, r1\n\ orrs r0, r1\n\
lsrs r5, r0, 31\n\ lsrs r5, r0, 31\n\
b _0803B29A\n\ b _0803B29A\n\
.pool\n\ .pool\n\
_0803B288:\n\ _0803B288:\n\
ldr r1, =gBattleMainFunc\n\ ldr r1, =gBattleMainFunc\n\
ldr r0, =BattleIntroOpponent2SendsOutMonAnimation\n\ ldr r0, =BattleIntroOpponent2SendsOutMonAnimation\n\
b _0803B2F0\n\ b _0803B2F0\n\
.pool\n\ .pool\n\
_0803B298:\n\ _0803B298:\n\
movs r5, 0x1\n\ movs r5, 0x1\n\
_0803B29A:\n\ _0803B29A:\n\
ldr r0, =gBattleControllerExecFlags\n\ ldr r0, =gBattleControllerExecFlags\n\
ldr r2, [r0]\n\ ldr r2, [r0]\n\
cmp r2, 0\n\ cmp r2, 0\n\
bne _0803B2F2\n\ bne _0803B2F2\n\
ldr r0, =gActiveBattler\n\ ldr r0, =gActiveBattler\n\
strb r2, [r0]\n\ strb r2, [r0]\n\
ldr r1, =gBattlersCount\n\ ldr r1, =gBattlersCount\n\
adds r4, r0, 0\n\ adds r4, r0, 0\n\
ldrb r1, [r1]\n\ ldrb r1, [r1]\n\
cmp r2, r1\n\ cmp r2, r1\n\
bcs _0803B2EC\n\ bcs _0803B2EC\n\
adds r6, r4, 0\n\ adds r6, r4, 0\n\
_0803B2B2:\n\ _0803B2B2:\n\
ldrb r0, [r4]\n\ ldrb r0, [r4]\n\
bl GetBattlerPosition\n\ bl GetBattlerPosition\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r0, 24\n\ lsrs r0, 24\n\
cmp r0, r5\n\ cmp r0, r5\n\
bne _0803B2D8\n\ bne _0803B2D8\n\
movs r0, 0\n\ movs r0, 0\n\
bl BtlController_EmitIntroTrainerBallThrow\n\ bl BtlController_EmitIntroTrainerBallThrow\n\
ldrb r0, [r4]\n\ ldrb r0, [r4]\n\
bl MarkBattlerForControllerExec\n\ bl MarkBattlerForControllerExec\n\
ldr r0, =gBattleTypeFlags\n\ ldr r0, =gBattleTypeFlags\n\
ldr r0, [r0]\n\ ldr r0, [r0]\n\
ldr r1, =0x00008040\n\ ldr r1, =0x00008040\n\
ands r0, r1\n\ ands r0, r1\n\
cmp r0, 0\n\ cmp r0, 0\n\
bne _0803B288\n\ bne _0803B288\n\
_0803B2D8:\n\ _0803B2D8:\n\
ldrb r0, [r6]\n\ ldrb r0, [r6]\n\
adds r0, 0x1\n\ adds r0, 0x1\n\
strb r0, [r6]\n\ strb r0, [r6]\n\
ldr r1, =gBattlersCount\n\ ldr r1, =gBattlersCount\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r0, 24\n\ lsrs r0, 24\n\
ldr r4, =gActiveBattler\n\ ldr r4, =gActiveBattler\n\
ldrb r1, [r1]\n\ ldrb r1, [r1]\n\
cmp r0, r1\n\ cmp r0, r1\n\
bcc _0803B2B2\n\ bcc _0803B2B2\n\
_0803B2EC:\n\ _0803B2EC:\n\
ldr r1, =gBattleMainFunc\n\ ldr r1, =gBattleMainFunc\n\
ldr r0, =BattleIntroRecordMonsToDex\n\ ldr r0, =BattleIntroRecordMonsToDex\n\
_0803B2F0:\n\ _0803B2F0:\n\
str r0, [r1]\n\ str r0, [r1]\n\
_0803B2F2:\n\ _0803B2F2:\n\
pop {r4-r6}\n\ pop {r4-r6}\n\
pop {r0}\n\ pop {r0}\n\
bx r0\n\ bx r0\n\
.pool\n\ .pool\n\
.syntax divided"); .syntax divided");
} }
#endif // NONMATCHING #endif // NONMATCHING
@ -4591,10 +4591,10 @@ static void sub_803CDF8(void)
void SwapTurnOrder(u8 id1, u8 id2) void SwapTurnOrder(u8 id1, u8 id2)
{ {
u32 temp; u32 temp;
SWAP(gActionsByTurnOrder[id1], gActionsByTurnOrder[id2], temp); SWAP(gActionsByTurnOrder[id1], gActionsByTurnOrder[id2], temp);
SWAP(gBattlerByTurnOrder[id1], gBattlerByTurnOrder[id2], temp); SWAP(gBattlerByTurnOrder[id1], gBattlerByTurnOrder[id2], temp);
} }
u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves) u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves)
@ -5594,7 +5594,7 @@ bool8 TryRunFromBattle(u8 battler)
if (holdEffect == HOLD_EFFECT_CAN_ALWAYS_RUN) if (holdEffect == HOLD_EFFECT_CAN_ALWAYS_RUN)
{ {
gLastUsedItem = gBattleMons[battler].item ; gLastUsedItem = gBattleMons[battler].item;
gProtectStructs[battler].fleeFlag = 1; gProtectStructs[battler].fleeFlag = 1;
effect++; effect++;
} }

1882
src/battle_message.c
View File

File diff suppressed because it is too large Load Diff

2
src/battle_pike.c
View File

@ -9,7 +9,7 @@
#include "task.h" #include "task.h"
#include "battle_tower.h" #include "battle_tower.h"
#include "party_menu.h" #include "party_menu.h"
#include "malloc.h" #include "alloc.h"
#include "palette.h" #include "palette.h"
#include "script.h" #include "script.h"
#include "battle_setup.h" #include "battle_setup.h"

6
src/battle_pyramid.c
View File

@ -21,7 +21,7 @@
#include "main.h" #include "main.h"
#include "load_save.h" #include "load_save.h"
#include "script.h" #include "script.h"
#include "malloc.h" #include "alloc.h"
#include "overworld.h" #include "overworld.h"
#include "event_scripts.h" #include "event_scripts.h"
#include "constants/battle_frontier.h" #include "constants/battle_frontier.h"
@ -1458,7 +1458,7 @@ static u16 sub_81A9F90(u8 count)
do do
{ {
trainerId = sub_8162548(challengeNum + 1, battleNum); trainerId = sub_8162548(challengeNum + 1, battleNum);
for (i = 0 ; i < count; i++) for (i = 0; i < count; i++)
{ {
if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId) if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId)
break; break;
@ -1470,7 +1470,7 @@ static u16 sub_81A9F90(u8 count)
do do
{ {
trainerId = sub_8162548(challengeNum, battleNum); trainerId = sub_8162548(challengeNum, battleNum);
for (i = 0 ; i < count; i++) for (i = 0; i < count; i++)
{ {
if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId) if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId)
break; break;

2
src/battle_pyramid_bag.c
View File

@ -17,7 +17,7 @@
#include "list_menu.h" #include "list_menu.h"
#include "mail.h" #include "mail.h"
#include "main.h" #include "main.h"
#include "malloc.h" #include "alloc.h"
#include "menu.h" #include "menu.h"
#include "menu_helpers.h" #include "menu_helpers.h"
#include "overworld.h" #include "overworld.h"

2
src/battle_records.c
View File

@ -18,7 +18,7 @@
#include "international_string_util.h" #include "international_string_util.h"
#include "sound.h" #include "sound.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "malloc.h" #include "alloc.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "constants/game_stat.h" #include "constants/game_stat.h"

222
src/battle_script_commands.c
View File

@ -677,45 +677,45 @@ static const u32 sStatusFlagsForMoveEffects[] =
static const u8* const sMoveEffectBS_Ptrs[] = static const u8* const sMoveEffectBS_Ptrs[] =
{ {
BattleScript_MoveEffectSleep, // 0 [0] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_SLEEP [MOVE_EFFECT_SLEEP] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectPoison, // MOVE_EFFECT_POISON [MOVE_EFFECT_POISON] = BattleScript_MoveEffectPoison,
BattleScript_MoveEffectBurn, // MOVE_EFFECT_BURN [MOVE_EFFECT_BURN] = BattleScript_MoveEffectBurn,
BattleScript_MoveEffectFreeze, // MOVE_EFFECT_FREEZE [MOVE_EFFECT_FREEZE] = BattleScript_MoveEffectFreeze,
BattleScript_MoveEffectParalysis, // MOVE_EFFECT_PARALYSIS [MOVE_EFFECT_PARALYSIS] = BattleScript_MoveEffectParalysis,
BattleScript_MoveEffectToxic, // MOVE_EFFECT_TOXIC [MOVE_EFFECT_TOXIC] = BattleScript_MoveEffectToxic,
BattleScript_MoveEffectConfusion, // MOVE_EFFECT_CONFUSION [MOVE_EFFECT_CONFUSION] = BattleScript_MoveEffectConfusion,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_FLINCH [MOVE_EFFECT_FLINCH] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_TRI_ATTACK [MOVE_EFFECT_TRI_ATTACK] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectUproar, // MOVE_EFFECT_UPROAR [MOVE_EFFECT_UPROAR] = BattleScript_MoveEffectUproar,
BattleScript_MoveEffectPayDay, // MOVE_EFFECT_PAYDAY [MOVE_EFFECT_PAYDAY] = BattleScript_MoveEffectPayDay,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_CHARGING [MOVE_EFFECT_CHARGING] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectWrap, // MOVE_EFFECT_WRAP [MOVE_EFFECT_WRAP] = BattleScript_MoveEffectWrap,
BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_25 [MOVE_EFFECT_RECOIL_25] = BattleScript_MoveEffectRecoil,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_PLUS_1 [MOVE_EFFECT_ATK_PLUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_PLUS_1 [MOVE_EFFECT_DEF_PLUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_PLUS_1 [MOVE_EFFECT_SPD_PLUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_PLUS_1 [MOVE_EFFECT_SP_ATK_PLUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_PLUS_1 [MOVE_EFFECT_SP_DEF_PLUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_PLUS_1 [MOVE_EFFECT_ACC_PLUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_PLUS_1 [MOVE_EFFECT_EVS_PLUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_MINUS_1 [MOVE_EFFECT_ATK_MINUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_MINUS_1 [MOVE_EFFECT_DEF_MINUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_MINUS_1 [MOVE_EFFECT_SPD_MINUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_MINUS_1 [MOVE_EFFECT_SP_ATK_MINUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_MINUS_1 [MOVE_EFFECT_SP_DEF_MINUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_MINUS_1 [MOVE_EFFECT_ACC_MINUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_MINUS_1 [MOVE_EFFECT_EVS_MINUS_1] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_RECHARGE [MOVE_EFFECT_RECHARGE] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAGE [MOVE_EFFECT_RAGE] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_STEAL_ITEM [MOVE_EFFECT_STEAL_ITEM] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_PREVENT_ESCAPE [MOVE_EFFECT_PREVENT_ESCAPE] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_NIGHTMARE [MOVE_EFFECT_NIGHTMARE] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_ALL_STATS_UP [MOVE_EFFECT_ALL_STATS_UP] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAPIDSPIN [MOVE_EFFECT_RAPIDSPIN] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_REMOVE_PARALYSIS [MOVE_EFFECT_REMOVE_PARALYSIS] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_DEF_DOWN [MOVE_EFFECT_ATK_DEF_DOWN] = BattleScript_MoveEffectSleep,
BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_33 [MOVE_EFFECT_RECOIL_33] = BattleScript_MoveEffectRecoil,
}; };
static const struct WindowTemplate sUnusedWinTemplate = {0, 1, 3, 7, 0xF, 0x1F, 0x3F}; static const struct WindowTemplate sUnusedWinTemplate = {0, 1, 3, 7, 0xF, 0x1F, 0x3F};
@ -768,26 +768,26 @@ static const u16 sProtectSuccessRates[] = {USHRT_MAX, USHRT_MAX / 2, USHRT_MAX /
static const u16 sMovesForbiddenToCopy[] = static const u16 sMovesForbiddenToCopy[] =
{ {
MOVE_METRONOME, MOVE_METRONOME,
MOVE_STRUGGLE, MOVE_STRUGGLE,
MOVE_SKETCH, MOVE_SKETCH,
MOVE_MIMIC, MOVE_MIMIC,
MIMIC_FORBIDDEN_END, MIMIC_FORBIDDEN_END,
MOVE_COUNTER, MOVE_COUNTER,
MOVE_MIRROR_COAT, MOVE_MIRROR_COAT,
MOVE_PROTECT, MOVE_PROTECT,
MOVE_DETECT, MOVE_DETECT,
MOVE_ENDURE, MOVE_ENDURE,
MOVE_DESTINY_BOND, MOVE_DESTINY_BOND,
MOVE_SLEEP_TALK, MOVE_SLEEP_TALK,
MOVE_THIEF, MOVE_THIEF,
MOVE_FOLLOW_ME, MOVE_FOLLOW_ME,
MOVE_SNATCH, MOVE_SNATCH,
MOVE_HELPING_HAND, MOVE_HELPING_HAND,
MOVE_COVET, MOVE_COVET,
MOVE_TRICK, MOVE_TRICK,
MOVE_FOCUS_PUNCH, MOVE_FOCUS_PUNCH,
METRONOME_FORBIDDEN_END METRONOME_FORBIDDEN_END
}; };
static const u8 sFlailHpScaleToPowerTable[] = static const u8 sFlailHpScaleToPowerTable[] =
@ -828,38 +828,38 @@ static const u16 sWeightToDamageTable[] =
static const u16 sPickupItems[] = static const u16 sPickupItems[] =
{ {
ITEM_POTION, ITEM_POTION,
ITEM_ANTIDOTE, ITEM_ANTIDOTE,
ITEM_SUPER_POTION, ITEM_SUPER_POTION,
ITEM_GREAT_BALL, ITEM_GREAT_BALL,
ITEM_REPEL, ITEM_REPEL,
ITEM_ESCAPE_ROPE, ITEM_ESCAPE_ROPE,
ITEM_X_ATTACK, ITEM_X_ATTACK,
ITEM_FULL_HEAL, ITEM_FULL_HEAL,
ITEM_ULTRA_BALL, ITEM_ULTRA_BALL,
ITEM_HYPER_POTION, ITEM_HYPER_POTION,
ITEM_RARE_CANDY, ITEM_RARE_CANDY,
ITEM_PROTEIN, ITEM_PROTEIN,
ITEM_REVIVE, ITEM_REVIVE,
ITEM_HP_UP, ITEM_HP_UP,
ITEM_FULL_RESTORE, ITEM_FULL_RESTORE,
ITEM_MAX_REVIVE, ITEM_MAX_REVIVE,
ITEM_PP_UP, ITEM_PP_UP,
ITEM_MAX_ELIXIR, ITEM_MAX_ELIXIR,
}; };
static const u16 sRarePickupItems[] = static const u16 sRarePickupItems[] =
{ {
ITEM_HYPER_POTION, ITEM_HYPER_POTION,
ITEM_NUGGET, ITEM_NUGGET,
ITEM_KINGS_ROCK, ITEM_KINGS_ROCK,
ITEM_FULL_RESTORE, ITEM_FULL_RESTORE,
ITEM_ETHER, ITEM_ETHER,
ITEM_WHITE_HERB, ITEM_WHITE_HERB,
ITEM_TM44_REST, ITEM_TM44_REST,
ITEM_ELIXIR, ITEM_ELIXIR,
ITEM_TM01_FOCUS_PUNCH, ITEM_TM01_FOCUS_PUNCH,
ITEM_LEFTOVERS, ITEM_LEFTOVERS,
ITEM_TM26_EARTHQUAKE, ITEM_TM26_EARTHQUAKE,
}; };
static const u8 sPickupProbabilities[] = static const u8 sPickupProbabilities[] =
@ -917,10 +917,10 @@ const ALIGNED(4) u8 gUnknown_0831C494[][4] =
static const u8 sUnknown_0831C4F8[] = static const u8 sUnknown_0831C4F8[] =
{ {
0x03, 0x00, 0x01, 0x00, 0x00, 0x01, 0x03, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x01, 0x03, 0x00,
0x01, 0x02, 0x02, 0x00, 0x03, 0x01, 0x03, 0x01, 0x01, 0x02, 0x02, 0x00, 0x03, 0x01, 0x03, 0x01,
0x02, 0x03, 0x03, 0x02, 0x01, 0x00, 0x02, 0x02, 0x02, 0x03, 0x03, 0x02, 0x01, 0x00, 0x02, 0x02,
0x03, 0x00, 0x00, 0x00 0x03, 0x00, 0x00, 0x00
}; };
static void atk00_attackcanceler(void) static void atk00_attackcanceler(void)
@ -3403,8 +3403,8 @@ static void atk23_getexp(void)
PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleStruct->expGetterBattlerId, gBattleStruct->expGetterMonId) PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleStruct->expGetterBattlerId, gBattleStruct->expGetterMonId)
// buffer 'gained' or 'gained a boosted' // buffer 'gained' or 'gained a boosted'
PREPARE_STRING_BUFFER(gBattleTextBuff2, i) PREPARE_STRING_BUFFER(gBattleTextBuff2, i)
PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff3, 5, gBattleMoveDamage) PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff3, 5, gBattleMoveDamage)
@ -4490,24 +4490,24 @@ static void atk48_playstatchangeanimation(void)
enum enum
{ {
ATK49_RAGE, ATK49_RAGE,
ATK49_DEFROST, ATK49_DEFROST,
ATK49_SYNCHRONIZE_TARGET, ATK49_SYNCHRONIZE_TARGET,
ATK49_MOVE_END_ABILITIES, ATK49_MOVE_END_ABILITIES,
ATK49_STATUS_IMMUNITY_ABILITIES, ATK49_STATUS_IMMUNITY_ABILITIES,
ATK49_SYNCHRONIZE_ATTACKER, ATK49_SYNCHRONIZE_ATTACKER,
ATK49_CHOICE_MOVE, ATK49_CHOICE_MOVE,
ATK49_CHANGED_ITEMS, ATK49_CHANGED_ITEMS,
ATK49_ATTACKER_INVISIBLE, ATK49_ATTACKER_INVISIBLE,
ATK49_ATTACKER_VISIBLE, ATK49_ATTACKER_VISIBLE,
ATK49_TARGET_VISIBLE, ATK49_TARGET_VISIBLE,
ATK49_ITEM_EFFECTS_ALL, ATK49_ITEM_EFFECTS_ALL,
ATK49_KINGSROCK_SHELLBELL, ATK49_KINGSROCK_SHELLBELL,
ATK49_SUBSTITUTE, ATK49_SUBSTITUTE,
ATK49_UPDATE_LAST_MOVES, ATK49_UPDATE_LAST_MOVES,
ATK49_MIRROR_MOVE, ATK49_MIRROR_MOVE,
ATK49_NEXT_TARGET, ATK49_NEXT_TARGET,
ATK49_COUNT, ATK49_COUNT,
}; };
static void atk49_moveend(void) static void atk49_moveend(void)
@ -5560,7 +5560,7 @@ static void atk52_switchineffects(void)
gDisableStructs[gActiveBattler].truantUnknownBit = 0; gDisableStructs[gActiveBattler].truantUnknownBit = 0;
if (!AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gActiveBattler, 0, 0, 0) if (!AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gActiveBattler, 0, 0, 0)
&& !ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gActiveBattler, FALSE)) && !ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gActiveBattler, FALSE))
{ {
gSideStatuses[GetBattlerSide(gActiveBattler)] &= ~(SIDE_STATUS_SPIKES_DAMAGED); gSideStatuses[GetBattlerSide(gActiveBattler)] &= ~(SIDE_STATUS_SPIKES_DAMAGED);

38
src/battle_transition.c
View File

@ -7,7 +7,7 @@
#include "field_effect.h" #include "field_effect.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "main.h" #include "main.h"
#include "malloc.h" #include "alloc.h"
#include "overworld.h" #include "overworld.h"
#include "palette.h" #include "palette.h"
#include "random.h" #include "random.h"
@ -612,32 +612,32 @@ static const s16 gUnknown_085C8CF2[] = {4, 517, -1};
static const s16 *const gUnknown_085C8CF8[] = static const s16 *const gUnknown_085C8CF8[] =
{ {
gUnknown_085C8C90, gUnknown_085C8C90,
gUnknown_085C8CA4, gUnknown_085C8CA4,
gUnknown_085C8C98, gUnknown_085C8C98,
gUnknown_085C8C9E, gUnknown_085C8C9E,
gUnknown_085C8CEA, gUnknown_085C8CEA,
gUnknown_085C8CE4, gUnknown_085C8CE4,
gUnknown_085C8CF2, gUnknown_085C8CF2,
gUnknown_085C8CDE gUnknown_085C8CDE
}; };
static const s16 *const gUnknown_085C8D18[] = static const s16 *const gUnknown_085C8D18[] =
{ {
gUnknown_085C8CBC, gUnknown_085C8CBC,
gUnknown_085C8CB0, gUnknown_085C8CB0,
gUnknown_085C8CB6, gUnknown_085C8CB6,
gUnknown_085C8CAA, gUnknown_085C8CAA,
gUnknown_085C8CCA, gUnknown_085C8CCA,
gUnknown_085C8CD8, gUnknown_085C8CD8,
gUnknown_085C8CC4, gUnknown_085C8CC4,
gUnknown_085C8CD2 gUnknown_085C8CD2
}; };
static const s16 *const *const gUnknown_085C8D38[] = static const s16 *const *const gUnknown_085C8D38[] =
{ {
gUnknown_085C8CF8, gUnknown_085C8CF8,
gUnknown_085C8D18 gUnknown_085C8D18
}; };
static const TransitionStateFunc sPhase2_Groudon_Funcs[] = static const TransitionStateFunc sPhase2_Groudon_Funcs[] =

594
src/battle_tv.c
View File

@ -815,324 +815,324 @@ void TryPutLinkBattleTvShowOnAir(void)
{ {
asm_unified( asm_unified(
"push {r4-r7,lr}\n\ "push {r4-r7,lr}\n\
mov r7, r10\n\ mov r7, r10\n\
mov r6, r9\n\ mov r6, r9\n\
mov r5, r8\n\ mov r5, r8\n\
push {r5-r7}\n\ push {r5-r7}\n\
sub sp, 0x20\n\ sub sp, 0x20\n\
movs r0, 0\n\ movs r0, 0\n\
str r0, [sp]\n\ str r0, [sp]\n\
movs r1, 0\n\ movs r1, 0\n\
str r1, [sp, 0x4]\n\ str r1, [sp, 0x4]\n\
movs r2, 0\n\ movs r2, 0\n\
str r2, [sp, 0x8]\n\ str r2, [sp, 0x8]\n\
ldr r3, =0x00007fff\n\ ldr r3, =0x00007fff\n\
str r3, [sp, 0xC]\n\ str r3, [sp, 0xC]\n\
movs r4, 0\n\ movs r4, 0\n\
str r4, [sp, 0x10]\n\ str r4, [sp, 0x10]\n\
movs r7, 0\n\ movs r7, 0\n\
str r7, [sp, 0x14]\n\ str r7, [sp, 0x14]\n\
mov r8, r0\n\ mov r8, r0\n\
ldr r0, =gBattleStruct\n\ ldr r0, =gBattleStruct\n\
ldr r1, [r0]\n\ ldr r1, [r0]\n\
adds r0, r1, 0\n\ adds r0, r1, 0\n\
adds r0, 0xB3\n\ adds r0, 0xB3\n\
ldrb r0, [r0]\n\ ldrb r0, [r0]\n\
cmp r0, 0\n\ cmp r0, 0\n\
beq _0817E42A\n\ beq _0817E42A\n\
b _0817E670\n\ b _0817E670\n\
_0817E42A:\n\ _0817E42A:\n\
movs r2, 0xD2\n\ movs r2, 0xD2\n\
lsls r2, 1\n\ lsls r2, 1\n\
adds r2, r1\n\ adds r2, r1\n\
mov r10, r2\n\ mov r10, r2\n\
movs r6, 0\n\ movs r6, 0\n\
_0817E434:\n\ _0817E434:\n\
movs r0, 0x64\n\ movs r0, 0x64\n\
adds r4, r6, 0\n\ adds r4, r6, 0\n\
muls r4, r0\n\ muls r4, r0\n\
ldr r0, =gPlayerParty\n\ ldr r0, =gPlayerParty\n\
adds r0, r4, r0\n\ adds r0, r4, r0\n\
movs r1, 0xB\n\ movs r1, 0xB\n\
movs r2, 0\n\ movs r2, 0\n\
bl GetMonData\n\ bl GetMonData\n\
cmp r0, 0\n\ cmp r0, 0\n\
beq _0817E454\n\ beq _0817E454\n\
mov r0, r8\n\ mov r0, r8\n\
adds r0, 0x1\n\ adds r0, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r0, 24\n\ lsrs r0, 24\n\
mov r8, r0\n\ mov r8, r0\n\
_0817E454:\n\ _0817E454:\n\
ldr r5, =gEnemyParty\n\ ldr r5, =gEnemyParty\n\
adds r0, r4, r5\n\ adds r0, r4, r5\n\
movs r1, 0xB\n\ movs r1, 0xB\n\
movs r2, 0\n\ movs r2, 0\n\
bl GetMonData\n\ bl GetMonData\n\
cmp r0, 0\n\ cmp r0, 0\n\
beq _0817E46A\n\ beq _0817E46A\n\
adds r0, r7, 0x1\n\ adds r0, r7, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r7, r0, 24\n\ lsrs r7, r0, 24\n\
_0817E46A:\n\ _0817E46A:\n\
adds r6, 0x1\n\ adds r6, 0x1\n\
cmp r6, 0x5\n\ cmp r6, 0x5\n\
ble _0817E434\n\ ble _0817E434\n\
ldr r0, =gBattleTypeFlags\n\ ldr r0, =gBattleTypeFlags\n\
ldr r0, [r0]\n\ ldr r0, [r0]\n\
movs r1, 0x2\n\ movs r1, 0x2\n\
ands r0, r1\n\ ands r0, r1\n\
cmp r0, 0\n\ cmp r0, 0\n\
bne _0817E47E\n\ bne _0817E47E\n\
b _0817E670\n\ b _0817E670\n\
_0817E47E:\n\ _0817E47E:\n\
cmp r8, r7\n\ cmp r8, r7\n\
beq _0817E484\n\ beq _0817E484\n\
b _0817E670\n\ b _0817E670\n\
_0817E484:\n\ _0817E484:\n\
movs r6, 0\n\ movs r6, 0\n\
lsls r3, r6, 1\n\ lsls r3, r6, 1\n\
str r3, [sp, 0x18]\n\ str r3, [sp, 0x18]\n\
movs r4, 0x64\n\ movs r4, 0x64\n\
mov r8, r4\n\ mov r8, r4\n\
_0817E48E:\n\ _0817E48E:\n\
mov r1, r8\n\ mov r1, r8\n\
muls r1, r6\n\ muls r1, r6\n\
ldr r0, =gPlayerParty\n\ ldr r0, =gPlayerParty\n\
adds r4, r1, r0\n\ adds r4, r1, r0\n\
adds r0, r4, 0\n\ adds r0, r4, 0\n\
movs r1, 0xB\n\ movs r1, 0xB\n\
movs r2, 0\n\ movs r2, 0\n\
bl GetMonData\n\ bl GetMonData\n\
lsls r0, 16\n\ lsls r0, 16\n\
lsrs r7, r0, 16\n\ lsrs r7, r0, 16\n\
adds r0, r6, 0x1\n\ adds r0, r6, 0x1\n\
mov r9, r0\n\ mov r9, r0\n\
cmp r7, 0\n\ cmp r7, 0\n\
beq _0817E4EE\n\ beq _0817E4EE\n\
adds r0, r4, 0\n\ adds r0, r4, 0\n\
movs r1, 0x2D\n\ movs r1, 0x2D\n\
movs r2, 0\n\ movs r2, 0\n\
bl GetMonData\n\ bl GetMonData\n\
cmp r0, 0\n\ cmp r0, 0\n\
bne _0817E4EE\n\ bne _0817E4EE\n\
movs r4, 0\n\ movs r4, 0\n\
lsls r0, r6, 3\n\ lsls r0, r6, 3\n\
mov r2, r10\n\ mov r2, r10\n\
adds r1, r0, r2\n\ adds r1, r0, r2\n\
movs r3, 0x3\n\ movs r3, 0x3\n\
_0817E4C4:\n\ _0817E4C4:\n\
lsls r0, r4, 16\n\ lsls r0, r4, 16\n\
asrs r0, 16\n\ asrs r0, 16\n\
ldrh r4, [r1]\n\ ldrh r4, [r1]\n\
adds r0, r4\n\ adds r0, r4\n\
lsls r0, 16\n\ lsls r0, 16\n\
lsrs r4, r0, 16\n\ lsrs r4, r0, 16\n\
adds r1, 0x2\n\ adds r1, 0x2\n\
subs r3, 0x1\n\ subs r3, 0x1\n\
cmp r3, 0\n\ cmp r3, 0\n\
bge _0817E4C4\n\ bge _0817E4C4\n\
ldr r1, [sp, 0x8]\n\ ldr r1, [sp, 0x8]\n\
lsls r0, r1, 16\n\ lsls r0, r1, 16\n\
lsls r1, r4, 16\n\ lsls r1, r4, 16\n\
cmp r0, r1\n\ cmp r0, r1\n\
bge _0817E4EE\n\ bge _0817E4EE\n\
lsls r0, r6, 24\n\ lsls r0, r6, 24\n\
lsrs r0, 24\n\ lsrs r0, 24\n\
str r0, [sp, 0x10]\n\ str r0, [sp, 0x10]\n\
lsrs r1, 16\n\ lsrs r1, 16\n\
str r1, [sp, 0x8]\n\ str r1, [sp, 0x8]\n\
str r7, [sp]\n\ str r7, [sp]\n\
_0817E4EE:\n\ _0817E4EE:\n\
mov r0, r8\n\ mov r0, r8\n\
muls r0, r6\n\ muls r0, r6\n\
ldr r2, =gEnemyParty\n\ ldr r2, =gEnemyParty\n\
adds r4, r0, r2\n\ adds r4, r0, r2\n\
adds r0, r4, 0\n\ adds r0, r4, 0\n\
movs r1, 0xB\n\ movs r1, 0xB\n\
movs r2, 0\n\ movs r2, 0\n\
bl GetMonData\n\ bl GetMonData\n\
lsls r0, 16\n\ lsls r0, 16\n\
lsrs r7, r0, 16\n\ lsrs r7, r0, 16\n\
ldr r3, [sp, 0x8]\n\ ldr r3, [sp, 0x8]\n\
lsls r3, 16\n\ lsls r3, 16\n\
str r3, [sp, 0x1C]\n\ str r3, [sp, 0x1C]\n\
cmp r7, 0\n\ cmp r7, 0\n\
beq _0817E5A0\n\ beq _0817E5A0\n\
adds r0, r4, 0\n\ adds r0, r4, 0\n\
movs r1, 0x2D\n\ movs r1, 0x2D\n\
movs r2, 0\n\ movs r2, 0\n\
bl GetMonData\n\ bl GetMonData\n\
cmp r0, 0\n\ cmp r0, 0\n\
bne _0817E5A0\n\ bne _0817E5A0\n\
movs r4, 0\n\ movs r4, 0\n\
ldr r0, [sp, 0xC]\n\ ldr r0, [sp, 0xC]\n\
lsls r2, r0, 16\n\ lsls r2, r0, 16\n\
movs r3, 0x1\n\ movs r3, 0x1\n\
lsls r1, r3, 1\n\ lsls r1, r3, 1\n\
adds r1, 0x1\n\ adds r1, 0x1\n\
lsls r1, 4\n\ lsls r1, 4\n\
lsls r0, r6, 3\n\ lsls r0, r6, 3\n\
adds r0, r1\n\ adds r0, r1\n\
mov r3, r10\n\ mov r3, r10\n\
adds r1, r0, r3\n\ adds r1, r0, r3\n\
movs r3, 0x3\n\ movs r3, 0x3\n\
_0817E534:\n\ _0817E534:\n\
lsls r0, r4, 16\n\ lsls r0, r4, 16\n\
asrs r0, 16\n\ asrs r0, 16\n\
ldrh r4, [r1]\n\ ldrh r4, [r1]\n\
adds r0, r4\n\ adds r0, r4\n\
lsls r0, 16\n\ lsls r0, 16\n\
lsrs r4, r0, 16\n\ lsrs r4, r0, 16\n\
adds r1, 0x2\n\ adds r1, 0x2\n\
subs r3, 0x1\n\ subs r3, 0x1\n\
cmp r3, 0\n\ cmp r3, 0\n\
bge _0817E534\n\ bge _0817E534\n\
asrs r1, r2, 16\n\ asrs r1, r2, 16\n\
lsls r5, r4, 16\n\ lsls r5, r4, 16\n\
asrs r0, r5, 16\n\ asrs r0, r5, 16\n\
cmp r1, r0\n\ cmp r1, r0\n\
bne _0817E590\n\ bne _0817E590\n\
mov r0, r8\n\ mov r0, r8\n\
muls r0, r6\n\ muls r0, r6\n\
ldr r1, =gEnemyParty\n\ ldr r1, =gEnemyParty\n\
adds r0, r1\n\ adds r0, r1\n\
movs r1, 0x19\n\ movs r1, 0x19\n\
movs r2, 0\n\ movs r2, 0\n\
bl GetMonData\n\ bl GetMonData\n\
adds r4, r0, 0\n\ adds r4, r0, 0\n\
ldr r2, [sp, 0x14]\n\ ldr r2, [sp, 0x14]\n\
mov r0, r8\n\ mov r0, r8\n\
muls r0, r2\n\ muls r0, r2\n\
ldr r3, =gEnemyParty\n\ ldr r3, =gEnemyParty\n\
adds r0, r3\n\ adds r0, r3\n\
movs r1, 0x19\n\ movs r1, 0x19\n\
movs r2, 0\n\ movs r2, 0\n\
bl GetMonData\n\ bl GetMonData\n\
cmp r4, r0\n\ cmp r4, r0\n\
bls _0817E5A0\n\ bls _0817E5A0\n\
b _0817E594\n\ b _0817E594\n\
.pool\n\ .pool\n\
_0817E590:\n\ _0817E590:\n\
cmp r1, r0\n\ cmp r1, r0\n\
ble _0817E5A0\n\ ble _0817E5A0\n\
_0817E594:\n\ _0817E594:\n\
lsls r0, r6, 24\n\ lsls r0, r6, 24\n\
lsrs r0, 24\n\ lsrs r0, 24\n\
str r0, [sp, 0x14]\n\ str r0, [sp, 0x14]\n\
lsrs r5, 16\n\ lsrs r5, 16\n\
str r5, [sp, 0xC]\n\ str r5, [sp, 0xC]\n\
str r7, [sp, 0x4]\n\ str r7, [sp, 0x4]\n\
_0817E5A0:\n\ _0817E5A0:\n\
mov r6, r9\n\ mov r6, r9\n\
cmp r6, 0x5\n\ cmp r6, 0x5\n\
bgt _0817E5A8\n\ bgt _0817E5A8\n\
b _0817E48E\n\ b _0817E48E\n\
_0817E5A8:\n\ _0817E5A8:\n\
movs r4, 0\n\ movs r4, 0\n\
movs r6, 0\n\ movs r6, 0\n\
movs r3, 0\n\ movs r3, 0\n\
ldr r5, =gPlayerParty\n\ ldr r5, =gPlayerParty\n\
ldr r7, [sp, 0x10]\n\ ldr r7, [sp, 0x10]\n\
lsls r0, r7, 3\n\ lsls r0, r7, 3\n\
mov r1, r10\n\ mov r1, r10\n\
adds r2, r0, r1\n\ adds r2, r0, r1\n\
_0817E5B8:\n\ _0817E5B8:\n\
lsls r0, r4, 16\n\ lsls r0, r4, 16\n\
asrs r0, 16\n\ asrs r0, 16\n\
movs r7, 0\n\ movs r7, 0\n\
ldrsh r1, [r2, r7]\n\ ldrsh r1, [r2, r7]\n\
cmp r0, r1\n\ cmp r0, r1\n\
bge _0817E5C8\n\ bge _0817E5C8\n\
ldrh r4, [r2]\n\ ldrh r4, [r2]\n\
adds r6, r3, 0\n\ adds r6, r3, 0\n\
_0817E5C8:\n\ _0817E5C8:\n\
adds r2, 0x2\n\ adds r2, 0x2\n\
adds r3, 0x1\n\ adds r3, 0x1\n\
cmp r3, 0x3\n\ cmp r3, 0x3\n\
ble _0817E5B8\n\ ble _0817E5B8\n\
movs r0, 0x64\n\ movs r0, 0x64\n\
ldr r1, [sp, 0x10]\n\ ldr r1, [sp, 0x10]\n\
muls r0, r1\n\ muls r0, r1\n\
adds r0, r5\n\ adds r0, r5\n\
adds r1, r6, 0\n\ adds r1, r6, 0\n\
adds r1, 0xD\n\ adds r1, 0xD\n\
movs r2, 0\n\ movs r2, 0\n\
bl GetMonData\n\ bl GetMonData\n\
lsls r0, 16\n\ lsls r0, 16\n\
lsrs r4, r0, 16\n\ lsrs r4, r0, 16\n\
ldr r2, [sp, 0x1C]\n\ ldr r2, [sp, 0x1C]\n\
cmp r2, 0\n\ cmp r2, 0\n\
beq _0817E670\n\ beq _0817E670\n\
cmp r4, 0\n\ cmp r4, 0\n\
beq _0817E670\n\ beq _0817E670\n\
ldr r0, =gBattleTypeFlags\n\ ldr r0, =gBattleTypeFlags\n\
ldr r0, [r0]\n\ ldr r0, [r0]\n\
movs r1, 0x40\n\ movs r1, 0x40\n\
ands r0, r1\n\ ands r0, r1\n\
cmp r0, 0\n\ cmp r0, 0\n\
beq _0817E65C\n\ beq _0817E65C\n\
ldr r3, [sp, 0x10]\n\ ldr r3, [sp, 0x10]\n\
cmp r3, 0x2\n\ cmp r3, 0x2\n\
bhi _0817E620\n\ bhi _0817E620\n\
ldr r0, =gBattleScripting\n\ ldr r0, =gBattleScripting\n\
adds r0, 0x25\n\ adds r0, 0x25\n\
ldrb r0, [r0]\n\ ldrb r0, [r0]\n\
bl GetLinkTrainerFlankId\n\ bl GetLinkTrainerFlankId\n\
lsls r0, 16\n\ lsls r0, 16\n\
cmp r0, 0\n\ cmp r0, 0\n\
beq _0817E630\n\ beq _0817E630\n\
b _0817E670\n\ b _0817E670\n\
.pool\n\ .pool\n\
_0817E620:\n\ _0817E620:\n\
ldr r0, =gBattleScripting\n\ ldr r0, =gBattleScripting\n\
adds r0, 0x25\n\ adds r0, 0x25\n\
ldrb r0, [r0]\n\ ldrb r0, [r0]\n\
bl GetLinkTrainerFlankId\n\ bl GetLinkTrainerFlankId\n\
lsls r0, 16\n\ lsls r0, 16\n\
cmp r0, 0\n\ cmp r0, 0\n\
beq _0817E670\n\ beq _0817E670\n\
_0817E630:\n\ _0817E630:\n\
movs r3, 0\n\ movs r3, 0\n\
ldr r7, [sp, 0x14]\n\ ldr r7, [sp, 0x14]\n\
cmp r7, 0x2\n\ cmp r7, 0x2\n\
bls _0817E63A\n\ bls _0817E63A\n\
movs r3, 0x1\n\ movs r3, 0x1\n\
_0817E63A:\n\ _0817E63A:\n\
lsls r0, r3, 24\n\ lsls r0, r3, 24\n\
lsrs r0, 24\n\ lsrs r0, 24\n\
ldr r1, =gBattleScripting\n\ ldr r1, =gBattleScripting\n\
adds r1, 0x25\n\ adds r1, 0x25\n\
ldrb r1, [r1]\n\ ldrb r1, [r1]\n\
bl sub_806EF84\n\ bl sub_806EF84\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r0, 24\n\ lsrs r0, 24\n\
adds r1, r4, 0\n\ adds r1, r4, 0\n\
ldr r2, [sp]\n\ ldr r2, [sp]\n\
ldr r3, [sp, 0x4]\n\ ldr r3, [sp, 0x4]\n\
bl PutBattleUpdateOnTheAir\n\ bl PutBattleUpdateOnTheAir\n\
b _0817E670\n\ b _0817E670\n\
.pool\n\ .pool\n\
_0817E65C:\n\ _0817E65C:\n\
ldr r0, =gBattleScripting\n\ ldr r0, =gBattleScripting\n\
adds r0, 0x25\n\ adds r0, 0x25\n\
ldrb r1, [r0]\n\ ldrb r1, [r0]\n\
movs r0, 0x1\n\ movs r0, 0x1\n\
eors r0, r1\n\ eors r0, r1\n\
adds r1, r4, 0\n\ adds r1, r4, 0\n\
ldr r2, [sp]\n\ ldr r2, [sp]\n\
ldr r3, [sp, 0x4]\n\ ldr r3, [sp, 0x4]\n\
bl PutBattleUpdateOnTheAir\n\ bl PutBattleUpdateOnTheAir\n\
_0817E670:\n\ _0817E670:\n\
add sp, 0x20\n\ add sp, 0x20\n\
pop {r3-r5}\n\ pop {r3-r5}\n\
mov r8, r3\n\ mov r8, r3\n\
mov r9, r4\n\ mov r9, r4\n\
mov r10, r5\n\ mov r10, r5\n\
pop {r4-r7}\n\ pop {r4-r7}\n\
pop {r0}\n\ pop {r0}\n\
bx r0\n\ bx r0\n\
.pool"); .pool");
} }
#endif #endif

2
src/battle_util2.c
View File

@ -1,7 +1,7 @@
#include "global.h" #include "global.h"
#include "battle.h" #include "battle.h"
#include "battle_controllers.h" #include "battle_controllers.h"
#include "malloc.h" #include "alloc.h"
#include "pokemon.h" #include "pokemon.h"
#include "event_data.h" #include "event_data.h"
#include "constants/abilities.h" #include "constants/abilities.h"

2
src/berry_blender.c
View File

@ -12,7 +12,7 @@
#include "bg.h" #include "bg.h"
#include "palette.h" #include "palette.h"
#include "decompress.h" #include "decompress.h"
#include "malloc.h" #include "alloc.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "text.h" #include "text.h"
#include "text_window.h" #include "text_window.h"

2
src/berry_fix_program.c
View File

@ -1,7 +1,7 @@
#include "global.h" #include "global.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "multiboot.h" #include "multiboot.h"
#include "malloc.h" #include "alloc.h"
#include "bg.h" #include "bg.h"
#include "graphics.h" #include "graphics.h"
#include "main.h" #include "main.h"

2
src/berry_tag_screen.c
View File

@ -21,7 +21,7 @@
#include "string_util.h" #include "string_util.h"
#include "strings.h" #include "strings.h"
#include "bg.h" #include "bg.h"
#include "malloc.h" #include "alloc.h"
#include "scanline_effect.h" #include "scanline_effect.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "graphics.h" #include "graphics.h"

2
src/contest.c
View File

@ -1,7 +1,7 @@
#include "global.h" #include "global.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "bg.h" #include "bg.h"
#include "malloc.h" #include "alloc.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/event_objects.h" #include "constants/event_objects.h"
#include "constants/moves.h" #include "constants/moves.h"

2
src/credits.c
View File

@ -3,7 +3,7 @@
#include "main.h" #include "main.h"
#include "task.h" #include "task.h"
#include "bg.h" #include "bg.h"
#include "malloc.h" #include "alloc.h"
#include "window.h" #include "window.h"
#include "text.h" #include "text.h"
#include "menu.h" #include "menu.h"

6000
src/data/contest_moves.h
View File

File diff suppressed because it is too large Load Diff

492
src/data/field_event_obj/event_object_graphics_info_pointers.h
View File

@ -247,253 +247,253 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldM
const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = { const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = {
&gEventObjectGraphicsInfo_BrendanNormal, &gEventObjectGraphicsInfo_BrendanNormal,
&gEventObjectGraphicsInfo_BrendanMachBike, &gEventObjectGraphicsInfo_BrendanMachBike,
&gEventObjectGraphicsInfo_BrendanSurfing, &gEventObjectGraphicsInfo_BrendanSurfing,
&gEventObjectGraphicsInfo_BrendanFieldMove, &gEventObjectGraphicsInfo_BrendanFieldMove,
&gEventObjectGraphicsInfo_QuintyPlump, &gEventObjectGraphicsInfo_QuintyPlump,
&gEventObjectGraphicsInfo_NinjaBoy, &gEventObjectGraphicsInfo_NinjaBoy,
&gEventObjectGraphicsInfo_Twin, &gEventObjectGraphicsInfo_Twin,
&gEventObjectGraphicsInfo_Boy1, &gEventObjectGraphicsInfo_Boy1,
&gEventObjectGraphicsInfo_Girl1, &gEventObjectGraphicsInfo_Girl1,
&gEventObjectGraphicsInfo_Boy2, &gEventObjectGraphicsInfo_Boy2,
&gEventObjectGraphicsInfo_Girl2, &gEventObjectGraphicsInfo_Girl2,
&gEventObjectGraphicsInfo_LittleBoy, &gEventObjectGraphicsInfo_LittleBoy,
&gEventObjectGraphicsInfo_LittleGirl, &gEventObjectGraphicsInfo_LittleGirl,
&gEventObjectGraphicsInfo_Boy3, &gEventObjectGraphicsInfo_Boy3,
&gEventObjectGraphicsInfo_Girl3, &gEventObjectGraphicsInfo_Girl3,
&gEventObjectGraphicsInfo_RichBoy, &gEventObjectGraphicsInfo_RichBoy,
&gEventObjectGraphicsInfo_Woman1, &gEventObjectGraphicsInfo_Woman1,
&gEventObjectGraphicsInfo_FatMan, &gEventObjectGraphicsInfo_FatMan,
&gEventObjectGraphicsInfo_PokefanF, &gEventObjectGraphicsInfo_PokefanF,
&gEventObjectGraphicsInfo_Man1, &gEventObjectGraphicsInfo_Man1,
&gEventObjectGraphicsInfo_Woman2, &gEventObjectGraphicsInfo_Woman2,
&gEventObjectGraphicsInfo_ExpertM, &gEventObjectGraphicsInfo_ExpertM,
&gEventObjectGraphicsInfo_ExpertF, &gEventObjectGraphicsInfo_ExpertF,
&gEventObjectGraphicsInfo_Man2, &gEventObjectGraphicsInfo_Man2,
&gEventObjectGraphicsInfo_Woman3, &gEventObjectGraphicsInfo_Woman3,
&gEventObjectGraphicsInfo_PokefanM, &gEventObjectGraphicsInfo_PokefanM,
&gEventObjectGraphicsInfo_Woman4, &gEventObjectGraphicsInfo_Woman4,
&gEventObjectGraphicsInfo_Cook, &gEventObjectGraphicsInfo_Cook,
&gEventObjectGraphicsInfo_LinkReceptionist, &gEventObjectGraphicsInfo_LinkReceptionist,
&gEventObjectGraphicsInfo_OldMan, &gEventObjectGraphicsInfo_OldMan,
&gEventObjectGraphicsInfo_OldWoman, &gEventObjectGraphicsInfo_OldWoman,
&gEventObjectGraphicsInfo_Camper, &gEventObjectGraphicsInfo_Camper,
&gEventObjectGraphicsInfo_Picnicker, &gEventObjectGraphicsInfo_Picnicker,
&gEventObjectGraphicsInfo_Man3, &gEventObjectGraphicsInfo_Man3,
&gEventObjectGraphicsInfo_Woman5, &gEventObjectGraphicsInfo_Woman5,
&gEventObjectGraphicsInfo_Youngster, &gEventObjectGraphicsInfo_Youngster,
&gEventObjectGraphicsInfo_BugCatcher, &gEventObjectGraphicsInfo_BugCatcher,
&gEventObjectGraphicsInfo_PsychicM, &gEventObjectGraphicsInfo_PsychicM,
&gEventObjectGraphicsInfo_SchoolKidM, &gEventObjectGraphicsInfo_SchoolKidM,
&gEventObjectGraphicsInfo_Maniac, &gEventObjectGraphicsInfo_Maniac,
&gEventObjectGraphicsInfo_HexManiac, &gEventObjectGraphicsInfo_HexManiac,
&gEventObjectGraphicsInfo_Rayquaza1, &gEventObjectGraphicsInfo_Rayquaza1,
&gEventObjectGraphicsInfo_SwimmerM, &gEventObjectGraphicsInfo_SwimmerM,
&gEventObjectGraphicsInfo_SwimmerF, &gEventObjectGraphicsInfo_SwimmerF,
&gEventObjectGraphicsInfo_BlackBelt, &gEventObjectGraphicsInfo_BlackBelt,
&gEventObjectGraphicsInfo_Beauty, &gEventObjectGraphicsInfo_Beauty,
&gEventObjectGraphicsInfo_Scientist1, &gEventObjectGraphicsInfo_Scientist1,
&gEventObjectGraphicsInfo_Lass, &gEventObjectGraphicsInfo_Lass,
&gEventObjectGraphicsInfo_Gentleman, &gEventObjectGraphicsInfo_Gentleman,
&gEventObjectGraphicsInfo_Sailor, &gEventObjectGraphicsInfo_Sailor,
&gEventObjectGraphicsInfo_Fisherman, &gEventObjectGraphicsInfo_Fisherman,
&gEventObjectGraphicsInfo_RunningTriathleteM, &gEventObjectGraphicsInfo_RunningTriathleteM,
&gEventObjectGraphicsInfo_RunningTriathleteF, &gEventObjectGraphicsInfo_RunningTriathleteF,
&gEventObjectGraphicsInfo_TuberF, &gEventObjectGraphicsInfo_TuberF,
&gEventObjectGraphicsInfo_TuberM, &gEventObjectGraphicsInfo_TuberM,
&gEventObjectGraphicsInfo_Hiker, &gEventObjectGraphicsInfo_Hiker,
&gEventObjectGraphicsInfo_CyclingTriathleteM, &gEventObjectGraphicsInfo_CyclingTriathleteM,
&gEventObjectGraphicsInfo_CyclingTriathleteF, &gEventObjectGraphicsInfo_CyclingTriathleteF,
&gEventObjectGraphicsInfo_Nurse, &gEventObjectGraphicsInfo_Nurse,
&gEventObjectGraphicsInfo_ItemBall, &gEventObjectGraphicsInfo_ItemBall,
&gEventObjectGraphicsInfo_BerryTree, &gEventObjectGraphicsInfo_BerryTree,
&gEventObjectGraphicsInfo_BerryTreeEarlyStages, &gEventObjectGraphicsInfo_BerryTreeEarlyStages,
&gEventObjectGraphicsInfo_BerryTreeLateStages, &gEventObjectGraphicsInfo_BerryTreeLateStages,
&gEventObjectGraphicsInfo_BrendanAcroBike, &gEventObjectGraphicsInfo_BrendanAcroBike,
&gEventObjectGraphicsInfo_ProfBirch, &gEventObjectGraphicsInfo_ProfBirch,
&gEventObjectGraphicsInfo_Man4, &gEventObjectGraphicsInfo_Man4,
&gEventObjectGraphicsInfo_Man5, &gEventObjectGraphicsInfo_Man5,
&gEventObjectGraphicsInfo_ReporterM, &gEventObjectGraphicsInfo_ReporterM,
&gEventObjectGraphicsInfo_ReporterF, &gEventObjectGraphicsInfo_ReporterF,
&gEventObjectGraphicsInfo_Bard, &gEventObjectGraphicsInfo_Bard,
&gEventObjectGraphicsInfo_Anabel, &gEventObjectGraphicsInfo_Anabel,
&gEventObjectGraphicsInfo_Tucker, &gEventObjectGraphicsInfo_Tucker,
&gEventObjectGraphicsInfo_Greta, &gEventObjectGraphicsInfo_Greta,
&gEventObjectGraphicsInfo_Spenser, &gEventObjectGraphicsInfo_Spenser,
&gEventObjectGraphicsInfo_Noland, &gEventObjectGraphicsInfo_Noland,
&gEventObjectGraphicsInfo_Lucy, &gEventObjectGraphicsInfo_Lucy,
&gEventObjectGraphicsInfo_UnusedNatuDoll, &gEventObjectGraphicsInfo_UnusedNatuDoll,
&gEventObjectGraphicsInfo_UnusedMagnemiteDoll, &gEventObjectGraphicsInfo_UnusedMagnemiteDoll,
&gEventObjectGraphicsInfo_UnusedSquirtleDoll, &gEventObjectGraphicsInfo_UnusedSquirtleDoll,
&gEventObjectGraphicsInfo_UnusedWooperDoll, &gEventObjectGraphicsInfo_UnusedWooperDoll,
&gEventObjectGraphicsInfo_UnusedPikachuDoll, &gEventObjectGraphicsInfo_UnusedPikachuDoll,
&gEventObjectGraphicsInfo_UnusedPorygon2Doll, &gEventObjectGraphicsInfo_UnusedPorygon2Doll,
&gEventObjectGraphicsInfo_CuttableTree, &gEventObjectGraphicsInfo_CuttableTree,
&gEventObjectGraphicsInfo_MartEmployee, &gEventObjectGraphicsInfo_MartEmployee,
&gEventObjectGraphicsInfo_RooftopSaleWoman, &gEventObjectGraphicsInfo_RooftopSaleWoman,
&gEventObjectGraphicsInfo_Teala, &gEventObjectGraphicsInfo_Teala,
&gEventObjectGraphicsInfo_BreakableRock, &gEventObjectGraphicsInfo_BreakableRock,
&gEventObjectGraphicsInfo_PushableBoulder, &gEventObjectGraphicsInfo_PushableBoulder,
&gEventObjectGraphicsInfo_MrBrineysBoat, &gEventObjectGraphicsInfo_MrBrineysBoat,
&gEventObjectGraphicsInfo_MayNormal, &gEventObjectGraphicsInfo_MayNormal,
&gEventObjectGraphicsInfo_MayMachBike, &gEventObjectGraphicsInfo_MayMachBike,
&gEventObjectGraphicsInfo_MayAcroBike, &gEventObjectGraphicsInfo_MayAcroBike,
&gEventObjectGraphicsInfo_MaySurfing, &gEventObjectGraphicsInfo_MaySurfing,
&gEventObjectGraphicsInfo_MayFieldMove, &gEventObjectGraphicsInfo_MayFieldMove,
&gEventObjectGraphicsInfo_Truck, &gEventObjectGraphicsInfo_Truck,
&gEventObjectGraphicsInfo_VigorothCarryingBox, &gEventObjectGraphicsInfo_VigorothCarryingBox,
&gEventObjectGraphicsInfo_VigorothFacingAway, &gEventObjectGraphicsInfo_VigorothFacingAway,
&gEventObjectGraphicsInfo_BirchsBag, &gEventObjectGraphicsInfo_BirchsBag,
&gEventObjectGraphicsInfo_EnemyZigzagoon, &gEventObjectGraphicsInfo_EnemyZigzagoon,
&gEventObjectGraphicsInfo_Artist, &gEventObjectGraphicsInfo_Artist,
&gEventObjectGraphicsInfo_RivalBrendanNormal, &gEventObjectGraphicsInfo_RivalBrendanNormal,
&gEventObjectGraphicsInfo_RivalBrendanMachBike, &gEventObjectGraphicsInfo_RivalBrendanMachBike,
&gEventObjectGraphicsInfo_RivalBrendanAcroBike, &gEventObjectGraphicsInfo_RivalBrendanAcroBike,
&gEventObjectGraphicsInfo_RivalBrendanSurfing, &gEventObjectGraphicsInfo_RivalBrendanSurfing,
&gEventObjectGraphicsInfo_RivalBrendanFieldMove, &gEventObjectGraphicsInfo_RivalBrendanFieldMove,
&gEventObjectGraphicsInfo_RivalMayNormal, &gEventObjectGraphicsInfo_RivalMayNormal,
&gEventObjectGraphicsInfo_RivalMayMachBike, &gEventObjectGraphicsInfo_RivalMayMachBike,
&gEventObjectGraphicsInfo_RivalMayAcroBike, &gEventObjectGraphicsInfo_RivalMayAcroBike,
&gEventObjectGraphicsInfo_RivalMaySurfing, &gEventObjectGraphicsInfo_RivalMaySurfing,
&gEventObjectGraphicsInfo_RivalMayFieldMove, &gEventObjectGraphicsInfo_RivalMayFieldMove,
&gEventObjectGraphicsInfo_Cameraman, &gEventObjectGraphicsInfo_Cameraman,
&gEventObjectGraphicsInfo_BrendanUnderwater, &gEventObjectGraphicsInfo_BrendanUnderwater,
&gEventObjectGraphicsInfo_MayUnderwater, &gEventObjectGraphicsInfo_MayUnderwater,
&gEventObjectGraphicsInfo_MovingBox, &gEventObjectGraphicsInfo_MovingBox,
&gEventObjectGraphicsInfo_CableCar, &gEventObjectGraphicsInfo_CableCar,
&gEventObjectGraphicsInfo_Scientist2, &gEventObjectGraphicsInfo_Scientist2,
&gEventObjectGraphicsInfo_DevonEmployee, &gEventObjectGraphicsInfo_DevonEmployee,
&gEventObjectGraphicsInfo_AquaMemberM, &gEventObjectGraphicsInfo_AquaMemberM,
&gEventObjectGraphicsInfo_AquaMemberF, &gEventObjectGraphicsInfo_AquaMemberF,
&gEventObjectGraphicsInfo_MagmaMemberM, &gEventObjectGraphicsInfo_MagmaMemberM,
&gEventObjectGraphicsInfo_MagmaMemberF, &gEventObjectGraphicsInfo_MagmaMemberF,
&gEventObjectGraphicsInfo_Sidney, &gEventObjectGraphicsInfo_Sidney,
&gEventObjectGraphicsInfo_Phoebe, &gEventObjectGraphicsInfo_Phoebe,
&gEventObjectGraphicsInfo_Glacia, &gEventObjectGraphicsInfo_Glacia,
&gEventObjectGraphicsInfo_Drake, &gEventObjectGraphicsInfo_Drake,
&gEventObjectGraphicsInfo_Roxanne, &gEventObjectGraphicsInfo_Roxanne,
&gEventObjectGraphicsInfo_Brawly, &gEventObjectGraphicsInfo_Brawly,
&gEventObjectGraphicsInfo_Wattson, &gEventObjectGraphicsInfo_Wattson,
&gEventObjectGraphicsInfo_Flannery, &gEventObjectGraphicsInfo_Flannery,
&gEventObjectGraphicsInfo_Norman, &gEventObjectGraphicsInfo_Norman,
&gEventObjectGraphicsInfo_Winona, &gEventObjectGraphicsInfo_Winona,
&gEventObjectGraphicsInfo_Liza, &gEventObjectGraphicsInfo_Liza,
&gEventObjectGraphicsInfo_Tate, &gEventObjectGraphicsInfo_Tate,
&gEventObjectGraphicsInfo_Wallace, &gEventObjectGraphicsInfo_Wallace,
&gEventObjectGraphicsInfo_Steven, &gEventObjectGraphicsInfo_Steven,
&gEventObjectGraphicsInfo_Wally, &gEventObjectGraphicsInfo_Wally,
&gEventObjectGraphicsInfo_RubySapphireLittleBoy, &gEventObjectGraphicsInfo_RubySapphireLittleBoy,
&gEventObjectGraphicsInfo_BrendanFishing, &gEventObjectGraphicsInfo_BrendanFishing,
&gEventObjectGraphicsInfo_MayFishing, &gEventObjectGraphicsInfo_MayFishing,
&gEventObjectGraphicsInfo_HotSpringsOldWoman, &gEventObjectGraphicsInfo_HotSpringsOldWoman,
&gEventObjectGraphicsInfo_SSTidal, &gEventObjectGraphicsInfo_SSTidal,
&gEventObjectGraphicsInfo_SubmarineShadow, &gEventObjectGraphicsInfo_SubmarineShadow,
&gEventObjectGraphicsInfo_PichuDoll, &gEventObjectGraphicsInfo_PichuDoll,
&gEventObjectGraphicsInfo_PikachuDoll, &gEventObjectGraphicsInfo_PikachuDoll,
&gEventObjectGraphicsInfo_MarillDoll, &gEventObjectGraphicsInfo_MarillDoll,
&gEventObjectGraphicsInfo_TogepiDoll, &gEventObjectGraphicsInfo_TogepiDoll,
&gEventObjectGraphicsInfo_CyndaquilDoll, &gEventObjectGraphicsInfo_CyndaquilDoll,
&gEventObjectGraphicsInfo_ChikoritaDoll, &gEventObjectGraphicsInfo_ChikoritaDoll,
&gEventObjectGraphicsInfo_TotodileDoll, &gEventObjectGraphicsInfo_TotodileDoll,
&gEventObjectGraphicsInfo_JigglypuffDoll, &gEventObjectGraphicsInfo_JigglypuffDoll,
&gEventObjectGraphicsInfo_MeowthDoll, &gEventObjectGraphicsInfo_MeowthDoll,
&gEventObjectGraphicsInfo_ClefairyDoll, &gEventObjectGraphicsInfo_ClefairyDoll,
&gEventObjectGraphicsInfo_DittoDoll, &gEventObjectGraphicsInfo_DittoDoll,
&gEventObjectGraphicsInfo_SmoochumDoll, &gEventObjectGraphicsInfo_SmoochumDoll,
&gEventObjectGraphicsInfo_TreeckoDoll, &gEventObjectGraphicsInfo_TreeckoDoll,
&gEventObjectGraphicsInfo_TorchicDoll, &gEventObjectGraphicsInfo_TorchicDoll,
&gEventObjectGraphicsInfo_MudkipDoll, &gEventObjectGraphicsInfo_MudkipDoll,
&gEventObjectGraphicsInfo_DuskullDoll, &gEventObjectGraphicsInfo_DuskullDoll,
&gEventObjectGraphicsInfo_WynautDoll, &gEventObjectGraphicsInfo_WynautDoll,
&gEventObjectGraphicsInfo_BaltoyDoll, &gEventObjectGraphicsInfo_BaltoyDoll,
&gEventObjectGraphicsInfo_KecleonDoll, &gEventObjectGraphicsInfo_KecleonDoll,
&gEventObjectGraphicsInfo_AzurillDoll, &gEventObjectGraphicsInfo_AzurillDoll,
&gEventObjectGraphicsInfo_SkittyDoll, &gEventObjectGraphicsInfo_SkittyDoll,
&gEventObjectGraphicsInfo_SwabluDoll, &gEventObjectGraphicsInfo_SwabluDoll,
&gEventObjectGraphicsInfo_GulpinDoll, &gEventObjectGraphicsInfo_GulpinDoll,
&gEventObjectGraphicsInfo_LotadDoll, &gEventObjectGraphicsInfo_LotadDoll,
&gEventObjectGraphicsInfo_SeedotDoll, &gEventObjectGraphicsInfo_SeedotDoll,
&gEventObjectGraphicsInfo_PikaCushion, &gEventObjectGraphicsInfo_PikaCushion,
&gEventObjectGraphicsInfo_RoundCushion, &gEventObjectGraphicsInfo_RoundCushion,
&gEventObjectGraphicsInfo_KissCushion, &gEventObjectGraphicsInfo_KissCushion,
&gEventObjectGraphicsInfo_ZigzagCushion, &gEventObjectGraphicsInfo_ZigzagCushion,
&gEventObjectGraphicsInfo_SpinCushion, &gEventObjectGraphicsInfo_SpinCushion,
&gEventObjectGraphicsInfo_DiamondCushion, &gEventObjectGraphicsInfo_DiamondCushion,
&gEventObjectGraphicsInfo_BallCushion, &gEventObjectGraphicsInfo_BallCushion,
&gEventObjectGraphicsInfo_GrassCushion, &gEventObjectGraphicsInfo_GrassCushion,
&gEventObjectGraphicsInfo_FireCushion, &gEventObjectGraphicsInfo_FireCushion,
&gEventObjectGraphicsInfo_WaterCushion, &gEventObjectGraphicsInfo_WaterCushion,
&gEventObjectGraphicsInfo_BigSnorlaxDoll, &gEventObjectGraphicsInfo_BigSnorlaxDoll,
&gEventObjectGraphicsInfo_BigRhydonDoll, &gEventObjectGraphicsInfo_BigRhydonDoll,
&gEventObjectGraphicsInfo_BigLaprasDoll, &gEventObjectGraphicsInfo_BigLaprasDoll,
&gEventObjectGraphicsInfo_BigVenusaurDoll, &gEventObjectGraphicsInfo_BigVenusaurDoll,
&gEventObjectGraphicsInfo_BigCharizardDoll, &gEventObjectGraphicsInfo_BigCharizardDoll,
&gEventObjectGraphicsInfo_BigBlastoiseDoll, &gEventObjectGraphicsInfo_BigBlastoiseDoll,
&gEventObjectGraphicsInfo_BigWailmerDoll, &gEventObjectGraphicsInfo_BigWailmerDoll,
&gEventObjectGraphicsInfo_BigRegirockDoll, &gEventObjectGraphicsInfo_BigRegirockDoll,
&gEventObjectGraphicsInfo_BigRegiceDoll, &gEventObjectGraphicsInfo_BigRegiceDoll,
&gEventObjectGraphicsInfo_BigRegisteelDoll, &gEventObjectGraphicsInfo_BigRegisteelDoll,
&gEventObjectGraphicsInfo_Latias, &gEventObjectGraphicsInfo_Latias,
&gEventObjectGraphicsInfo_Latios, &gEventObjectGraphicsInfo_Latios,
&gEventObjectGraphicsInfo_GameboyKid, &gEventObjectGraphicsInfo_GameboyKid,
&gEventObjectGraphicsInfo_ContestJudge, &gEventObjectGraphicsInfo_ContestJudge,
&gEventObjectGraphicsInfo_BrendanWatering, &gEventObjectGraphicsInfo_BrendanWatering,
&gEventObjectGraphicsInfo_MayWatering, &gEventObjectGraphicsInfo_MayWatering,
&gEventObjectGraphicsInfo_BrendanDecorating, &gEventObjectGraphicsInfo_BrendanDecorating,
&gEventObjectGraphicsInfo_MayDecorating, &gEventObjectGraphicsInfo_MayDecorating,
&gEventObjectGraphicsInfo_Archie, &gEventObjectGraphicsInfo_Archie,
&gEventObjectGraphicsInfo_Maxie, &gEventObjectGraphicsInfo_Maxie,
&gEventObjectGraphicsInfo_Kyogre1, &gEventObjectGraphicsInfo_Kyogre1,
&gEventObjectGraphicsInfo_Groudon1, &gEventObjectGraphicsInfo_Groudon1,
&gEventObjectGraphicsInfo_Fossil, &gEventObjectGraphicsInfo_Fossil,
&gEventObjectGraphicsInfo_Regirock, &gEventObjectGraphicsInfo_Regirock,
&gEventObjectGraphicsInfo_Regice, &gEventObjectGraphicsInfo_Regice,
&gEventObjectGraphicsInfo_Registeel, &gEventObjectGraphicsInfo_Registeel,
&gEventObjectGraphicsInfo_Skitty, &gEventObjectGraphicsInfo_Skitty,
&gEventObjectGraphicsInfo_Kecleon1, &gEventObjectGraphicsInfo_Kecleon1,
&gEventObjectGraphicsInfo_Kyogre2, &gEventObjectGraphicsInfo_Kyogre2,
&gEventObjectGraphicsInfo_Groudon2, &gEventObjectGraphicsInfo_Groudon2,
&gEventObjectGraphicsInfo_Rayquaza2, &gEventObjectGraphicsInfo_Rayquaza2,
&gEventObjectGraphicsInfo_Zigzagoon, &gEventObjectGraphicsInfo_Zigzagoon,
&gEventObjectGraphicsInfo_Pikachu, &gEventObjectGraphicsInfo_Pikachu,
&gEventObjectGraphicsInfo_Azumarill, &gEventObjectGraphicsInfo_Azumarill,
&gEventObjectGraphicsInfo_Wingull, &gEventObjectGraphicsInfo_Wingull,
&gEventObjectGraphicsInfo_Kecleon2, &gEventObjectGraphicsInfo_Kecleon2,
&gEventObjectGraphicsInfo_TuberMSwimming, &gEventObjectGraphicsInfo_TuberMSwimming,
&gEventObjectGraphicsInfo_Azurill, &gEventObjectGraphicsInfo_Azurill,
&gEventObjectGraphicsInfo_Mom, &gEventObjectGraphicsInfo_Mom,
&gEventObjectGraphicsInfo_LinkBrendan, &gEventObjectGraphicsInfo_LinkBrendan,
&gEventObjectGraphicsInfo_LinkMay, &gEventObjectGraphicsInfo_LinkMay,
&gEventObjectGraphicsInfo_Juan, &gEventObjectGraphicsInfo_Juan,
&gEventObjectGraphicsInfo_Scott, &gEventObjectGraphicsInfo_Scott,
&gEventObjectGraphicsInfo_Poochyena, &gEventObjectGraphicsInfo_Poochyena,
&gEventObjectGraphicsInfo_Kyogre3, &gEventObjectGraphicsInfo_Kyogre3,
&gEventObjectGraphicsInfo_Groudon3, &gEventObjectGraphicsInfo_Groudon3,
&gEventObjectGraphicsInfo_MysteryEventDeliveryman, &gEventObjectGraphicsInfo_MysteryEventDeliveryman,
&gEventObjectGraphicsInfo_Statue, &gEventObjectGraphicsInfo_Statue,
&gEventObjectGraphicsInfo_Kirlia, &gEventObjectGraphicsInfo_Kirlia,
&gEventObjectGraphicsInfo_Dusclops, &gEventObjectGraphicsInfo_Dusclops,
&gEventObjectGraphicsInfo_UnionRoomAttendant, &gEventObjectGraphicsInfo_UnionRoomAttendant,
&gEventObjectGraphicsInfo_Sudowoodo, &gEventObjectGraphicsInfo_Sudowoodo,
&gEventObjectGraphicsInfo_Mew, &gEventObjectGraphicsInfo_Mew,
&gEventObjectGraphicsInfo_Red, &gEventObjectGraphicsInfo_Red,
&gEventObjectGraphicsInfo_Leaf, &gEventObjectGraphicsInfo_Leaf,
&gEventObjectGraphicsInfo_Deoxys, &gEventObjectGraphicsInfo_Deoxys,
&gEventObjectGraphicsInfo_BirthIslandStone, &gEventObjectGraphicsInfo_BirthIslandStone,
&gEventObjectGraphicsInfo_Brandon, &gEventObjectGraphicsInfo_Brandon,
&gEventObjectGraphicsInfo_RubySapphireBrendan, &gEventObjectGraphicsInfo_RubySapphireBrendan,
&gEventObjectGraphicsInfo_RubySapphireMay, &gEventObjectGraphicsInfo_RubySapphireMay,
&gEventObjectGraphicsInfo_Lugia, &gEventObjectGraphicsInfo_Lugia,
&gEventObjectGraphicsInfo_HoOh, &gEventObjectGraphicsInfo_HoOh,
}; };
const struct EventObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = { const struct EventObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = {
&gEventObjectGraphicsInfo_Bard, &gEventObjectGraphicsInfo_Bard,
&gEventObjectGraphicsInfo_Hipster, &gEventObjectGraphicsInfo_Hipster,
&gEventObjectGraphicsInfo_Trader, &gEventObjectGraphicsInfo_Trader,
&gEventObjectGraphicsInfo_Storyteller, &gEventObjectGraphicsInfo_Storyteller,
&gEventObjectGraphicsInfo_Giddy, &gEventObjectGraphicsInfo_Giddy,
&gEventObjectGraphicsInfo_UnusedMauvilleOldMan1, &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1,
&gEventObjectGraphicsInfo_UnusedMauvilleOldMan2, &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2,
}; };

1216
src/data/field_event_obj/movement_action_func_tables.h
View File

File diff suppressed because it is too large Load Diff

2
src/data/graphics/items.h
View File

@ -134,7 +134,7 @@ const u32 gItemIconPalette_GreenShard[] = INCBIN_U32("graphics/items/icon_palett
const u32 gItemIcon_HPUp[] = INCBIN_U32("graphics/items/icons/hp_up.4bpp.lz"); const u32 gItemIcon_HPUp[] = INCBIN_U32("graphics/items/icons/hp_up.4bpp.lz");
const u32 gItemIconPalette_HPUp[] = INCBIN_U32("graphics/items/icon_palettes/hp_up.gbapal.lz"); const u32 gItemIconPalette_HPUp[] = INCBIN_U32("graphics/items/icon_palettes/hp_up.gbapal.lz");
const u32 gItemIcon_Vitamin[] = INCBIN_U32("graphics/items/icons/vitamin.4bpp.lz"); const u32 gItemIcon_Vitamin[] = INCBIN_U32("graphics/items/icons/vitamin.4bpp.lz");
const u32 gItemIconPalette_Protein[] = INCBIN_U32("graphics/items/icon_palettes/protein.gbapal.lz"); const u32 gItemIconPalette_Protein[] = INCBIN_U32("graphics/items/icon_palettes/protein.gbapal.lz");
const u32 gItemIconPalette_Iron[] = INCBIN_U32("graphics/items/icon_palettes/iron.gbapal.lz"); const u32 gItemIconPalette_Iron[] = INCBIN_U32("graphics/items/icon_palettes/iron.gbapal.lz");
const u32 gItemIconPalette_Carbos[] = INCBIN_U32("graphics/items/icon_palettes/carbos.gbapal.lz"); const u32 gItemIconPalette_Carbos[] = INCBIN_U32("graphics/items/icon_palettes/carbos.gbapal.lz");

116
src/data/item_icon_table.h
View File

@ -311,64 +311,64 @@ const u32 *const gItemIconTable[][2] =
[ITEM_CLAW_FOSSIL] = {gItemIcon_ClawFossil, gItemIconPalette_HoennFossil}, [ITEM_CLAW_FOSSIL] = {gItemIcon_ClawFossil, gItemIconPalette_HoennFossil},
[ITEM_DEVON_SCOPE] = {gItemIcon_DevonScope, gItemIconPalette_DevonScope}, [ITEM_DEVON_SCOPE] = {gItemIcon_DevonScope, gItemIconPalette_DevonScope},
// TMs / HMs // TMs / HMs
[ITEM_TM01] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, // TM01 [ITEM_TM01] = {gItemIcon_TM, gItemIconPalette_FightingTMHM},
[ITEM_TM02] = {gItemIcon_TM, gItemIconPalette_DragonTMHM}, // TM02 [ITEM_TM02] = {gItemIcon_TM, gItemIconPalette_DragonTMHM},
[ITEM_TM03] = {gItemIcon_TM, gItemIconPalette_WaterTMHM}, // TM03 [ITEM_TM03] = {gItemIcon_TM, gItemIconPalette_WaterTMHM},
[ITEM_TM04] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM04 [ITEM_TM04] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
[ITEM_TM05] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM05 [ITEM_TM05] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM06] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM}, // TM06 [ITEM_TM06] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM},
[ITEM_TM07] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, // TM07 [ITEM_TM07] = {gItemIcon_TM, gItemIconPalette_IceTMHM},
[ITEM_TM08] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, // TM08 [ITEM_TM08] = {gItemIcon_TM, gItemIconPalette_FightingTMHM},
[ITEM_TM09] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, // TM09 [ITEM_TM09] = {gItemIcon_TM, gItemIconPalette_GrassTMHM},
[ITEM_TM10] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM10 [ITEM_TM10] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM11] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM11 [ITEM_TM11] = {gItemIcon_TM, gItemIconPalette_FireTMHM},
[ITEM_TM12] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM12 [ITEM_TM12] = {gItemIcon_TM, gItemIconPalette_DarkTMHM},
[ITEM_TM13] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, // TM13 [ITEM_TM13] = {gItemIcon_TM, gItemIconPalette_IceTMHM},
[ITEM_TM14] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, // TM14 [ITEM_TM14] = {gItemIcon_TM, gItemIconPalette_IceTMHM},
[ITEM_TM15] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM15 [ITEM_TM15] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM16] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM16 [ITEM_TM16] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
[ITEM_TM17] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM17 [ITEM_TM17] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM18] = {gItemIcon_TM, gItemIconPalette_WaterTMHM}, // TM18 [ITEM_TM18] = {gItemIcon_TM, gItemIconPalette_WaterTMHM},
[ITEM_TM19] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, // TM19 [ITEM_TM19] = {gItemIcon_TM, gItemIconPalette_GrassTMHM},
[ITEM_TM20] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM20 [ITEM_TM20] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM21] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM21 [ITEM_TM21] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM22] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, // TM22 [ITEM_TM22] = {gItemIcon_TM, gItemIconPalette_GrassTMHM},
[ITEM_TM23] = {gItemIcon_TM, gItemIconPalette_SteelTMHM}, // TM23 [ITEM_TM23] = {gItemIcon_TM, gItemIconPalette_SteelTMHM},
[ITEM_TM24] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, // TM24 [ITEM_TM24] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM},
[ITEM_TM25] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, // TM25 [ITEM_TM25] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM},
[ITEM_TM26] = {gItemIcon_TM, gItemIconPalette_GroundTMHM}, // TM26 [ITEM_TM26] = {gItemIcon_TM, gItemIconPalette_GroundTMHM},
[ITEM_TM27] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM27 [ITEM_TM27] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM28] = {gItemIcon_TM, gItemIconPalette_GroundTMHM}, // TM28 [ITEM_TM28] = {gItemIcon_TM, gItemIconPalette_GroundTMHM},
[ITEM_TM29] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM29 [ITEM_TM29] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
[ITEM_TM30] = {gItemIcon_TM, gItemIconPalette_GhostTMHM}, // TM30 [ITEM_TM30] = {gItemIcon_TM, gItemIconPalette_GhostTMHM},
[ITEM_TM31] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, // TM31 [ITEM_TM31] = {gItemIcon_TM, gItemIconPalette_FightingTMHM},
[ITEM_TM32] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM32 [ITEM_TM32] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM33] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM33 [ITEM_TM33] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
[ITEM_TM34] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, // TM34 [ITEM_TM34] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM},
[ITEM_TM35] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM35 [ITEM_TM35] = {gItemIcon_TM, gItemIconPalette_FireTMHM},
[ITEM_TM36] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM}, // TM36 [ITEM_TM36] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM},
[ITEM_TM37] = {gItemIcon_TM, gItemIconPalette_RockTMHM}, // TM37 [ITEM_TM37] = {gItemIcon_TM, gItemIconPalette_RockTMHM},
[ITEM_TM38] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM38 [ITEM_TM38] = {gItemIcon_TM, gItemIconPalette_FireTMHM},
[ITEM_TM39] = {gItemIcon_TM, gItemIconPalette_RockTMHM}, // TM39 [ITEM_TM39] = {gItemIcon_TM, gItemIconPalette_RockTMHM},
[ITEM_TM40] = {gItemIcon_TM, gItemIconPalette_FlyingTMHM}, // TM40 [ITEM_TM40] = {gItemIcon_TM, gItemIconPalette_FlyingTMHM},
[ITEM_TM41] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM41 [ITEM_TM41] = {gItemIcon_TM, gItemIconPalette_DarkTMHM},
[ITEM_TM42] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM42 [ITEM_TM42] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM43] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM43 [ITEM_TM43] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM44] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM44 [ITEM_TM44] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
[ITEM_TM45] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM45 [ITEM_TM45] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM46] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM46 [ITEM_TM46] = {gItemIcon_TM, gItemIconPalette_DarkTMHM},
[ITEM_TM47] = {gItemIcon_TM, gItemIconPalette_SteelTMHM}, // TM47 [ITEM_TM47] = {gItemIcon_TM, gItemIconPalette_SteelTMHM},
[ITEM_TM48] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM48 [ITEM_TM48] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
[ITEM_TM49] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM49 [ITEM_TM49] = {gItemIcon_TM, gItemIconPalette_DarkTMHM},
[ITEM_TM50] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM50 [ITEM_TM50] = {gItemIcon_TM, gItemIconPalette_FireTMHM},
[ITEM_HM01] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, // HM01 [ITEM_HM01] = {gItemIcon_HM, gItemIconPalette_NormalTMHM},
[ITEM_HM02] = {gItemIcon_HM, gItemIconPalette_FlyingTMHM}, // HM02 [ITEM_HM02] = {gItemIcon_HM, gItemIconPalette_FlyingTMHM},
[ITEM_HM03] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, // HM03 [ITEM_HM03] = {gItemIcon_HM, gItemIconPalette_WaterTMHM},
[ITEM_HM04] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, // HM04 [ITEM_HM04] = {gItemIcon_HM, gItemIconPalette_NormalTMHM},
[ITEM_HM05] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, // HM05 [ITEM_HM05] = {gItemIcon_HM, gItemIconPalette_NormalTMHM},
[ITEM_HM06] = {gItemIcon_HM, gItemIconPalette_FightingTMHM}, // HM06 [ITEM_HM06] = {gItemIcon_HM, gItemIconPalette_FightingTMHM},
[ITEM_HM07] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, // HM07 [ITEM_HM07] = {gItemIcon_HM, gItemIconPalette_WaterTMHM},
[ITEM_HM08] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, // HM08 [ITEM_HM08] = {gItemIcon_HM, gItemIconPalette_WaterTMHM},
// ???????? // ????????
[ITEM_15B] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, [ITEM_15B] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_15C] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, [ITEM_15C] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},

270
src/data/pokemon/cry_ids.h
View File

@ -1,138 +1,138 @@
const u16 gSpeciesIdToCryId[] = const u16 gSpeciesIdToCryId[] =
{ {
273, // TREECKO [SPECIES_TREECKO - 277] = 273,
274, // GROVYLE [SPECIES_GROVYLE - 277] = 274,
275, // SCEPTILE [SPECIES_SCEPTILE - 277] = 275,
270, // TORCHIC [SPECIES_TORCHIC - 277] = 270,
271, // COMBUSKEN [SPECIES_COMBUSKEN - 277] = 271,
272, // BLAZIKEN [SPECIES_BLAZIKEN - 277] = 272,
276, // MUDKIP [SPECIES_MUDKIP - 277] = 276,
277, // MARSHTOMP [SPECIES_MARSHTOMP - 277] = 277,
278, // SWAMPERT [SPECIES_SWAMPERT - 277] = 278,
359, // POOCHYENA [SPECIES_POOCHYENA - 277] = 359,
360, // MIGHTYENA [SPECIES_MIGHTYENA - 277] = 360,
378, // ZIGZAGOON [SPECIES_ZIGZAGOON - 277] = 378,
375, // LINOONE [SPECIES_LINOONE - 277] = 375,
290, // WURMPLE [SPECIES_WURMPLE - 277] = 290,
291, // SILCOON [SPECIES_SILCOON - 277] = 291,
292, // BEAUTIFLY [SPECIES_BEAUTIFLY - 277] = 292,
293, // CASCOON [SPECIES_CASCOON - 277] = 293,
294, // DUSTOX [SPECIES_DUSTOX - 277] = 294,
283, // LOTAD [SPECIES_LOTAD - 277] = 283,
284, // LOMBRE [SPECIES_LOMBRE - 277] = 284,
285, // LUDICOLO [SPECIES_LUDICOLO - 277] = 285,
286, // SEEDOT [SPECIES_SEEDOT - 277] = 286,
287, // NUZLEAF [SPECIES_NUZLEAF - 277] = 287,
288, // SHIFTRY [SPECIES_SHIFTRY - 277] = 288,
301, // NINCADA [SPECIES_NINCADA - 277] = 301,
302, // NINJASK [SPECIES_NINJASK - 277] = 302,
303, // SHEDINJA [SPECIES_SHEDINJA - 277] = 303,
266, // TAILLOW [SPECIES_TAILLOW - 277] = 266,
267, // SWELLOW [SPECIES_SWELLOW - 277] = 267,
374, // SHROOMISH [SPECIES_SHROOMISH - 277] = 374,
373, // BRELOOM [SPECIES_BRELOOM - 277] = 373,
269, // SPINDA [SPECIES_SPINDA - 277] = 269,
280, // WINGULL [SPECIES_WINGULL - 277] = 280,
279, // PELIPPER [SPECIES_PELIPPER - 277] = 279,
310, // SURSKIT [SPECIES_SURSKIT - 277] = 310,
311, // MASQUERAIN [SPECIES_MASQUERAIN - 277] = 311,
377, // WAILMER [SPECIES_WAILMER - 277] = 377,
381, // WAILORD [SPECIES_WAILORD - 277] = 381,
312, // SKITTY [SPECIES_SKITTY - 277] = 312,
313, // DELCATTY [SPECIES_DELCATTY - 277] = 313,
251, // KECLEON [SPECIES_KECLEON - 277] = 251,
329, // BALTOY [SPECIES_BALTOY - 277] = 329,
330, // CLAYDOL [SPECIES_CLAYDOL - 277] = 330,
306, // NOSEPASS [SPECIES_NOSEPASS - 277] = 306,
253, // TORKOAL [SPECIES_TORKOAL - 277] = 253,
362, // SABLEYE [SPECIES_SABLEYE - 277] = 362,
318, // BARBOACH [SPECIES_BARBOACH - 277] = 318,
319, // WHISCASH [SPECIES_WHISCASH - 277] = 319,
368, // LUVDISC [SPECIES_LUVDISC - 277] = 368,
320, // CORPHISH [SPECIES_CORPHISH - 277] = 320,
321, // CRAWDAUNT [SPECIES_CRAWDAUNT - 277] = 321,
333, // FEEBAS [SPECIES_FEEBAS - 277] = 333,
334, // MILOTIC [SPECIES_MILOTIC - 277] = 334,
289, // CARVANHA [SPECIES_CARVANHA - 277] = 289,
260, // SHARPEDO [SPECIES_SHARPEDO - 277] = 260,
324, // TRAPINCH [SPECIES_TRAPINCH - 277] = 324,
325, // VIBRAVA [SPECIES_VIBRAVA - 277] = 325,
326, // FLYGON [SPECIES_FLYGON - 277] = 326,
304, // MAKUHITA [SPECIES_MAKUHITA - 277] = 304,
305, // HARIYAMA [SPECIES_HARIYAMA - 277] = 305,
254, // ELECTRIKE [SPECIES_ELECTRIKE - 277] = 254,
255, // MANECTRIC [SPECIES_MANECTRIC - 277] = 255,
316, // NUMEL [SPECIES_NUMEL - 277] = 316,
317, // CAMERUPT [SPECIES_CAMERUPT - 277] = 317,
338, // SPHEAL [SPECIES_SPHEAL - 277] = 338,
339, // SEALEO [SPECIES_SEALEO - 277] = 339,
340, // WALREIN [SPECIES_WALREIN - 277] = 340,
327, // CACNEA [SPECIES_CACNEA - 277] = 327,
328, // CACTURNE [SPECIES_CACTURNE - 277] = 328,
383, // SNORUNT [SPECIES_SNORUNT - 277] = 383,
307, // GLALIE [SPECIES_GLALIE - 277] = 307,
331, // LUNATONE [SPECIES_LUNATONE - 277] = 331,
332, // SOLROCK [SPECIES_SOLROCK - 277] = 332,
262, // AZURILL [SPECIES_AZURILL - 277] = 262,
322, // SPOINK [SPECIES_SPOINK - 277] = 322,
323, // GRUMPIG [SPECIES_GRUMPIG - 277] = 323,
308, // PLUSLE [SPECIES_PLUSLE - 277] = 308,
309, // MINUN [SPECIES_MINUN - 277] = 309,
363, // MAWILE [SPECIES_MAWILE - 277] = 363,
336, // MEDITITE [SPECIES_MEDITITE - 277] = 336,
337, // MEDICHAM [SPECIES_MEDICHAM - 277] = 337,
263, // SWABLU [SPECIES_SWABLU - 277] = 263,
264, // ALTARIA [SPECIES_ALTARIA - 277] = 264,
258, // WYNAUT [SPECIES_WYNAUT - 277] = 258,
256, // DUSKULL [SPECIES_DUSKULL - 277] = 256,
361, // DUSCLOPS [SPECIES_DUSCLOPS - 277] = 361,
252, // ROSELIA [SPECIES_ROSELIA - 277] = 252,
298, // SLAKOTH [SPECIES_SLAKOTH - 277] = 298,
299, // VIGOROTH [SPECIES_VIGOROTH - 277] = 299,
300, // SLAKING [SPECIES_SLAKING - 277] = 300,
314, // GULPIN [SPECIES_GULPIN - 277] = 314,
315, // SWALOT [SPECIES_SWALOT - 277] = 315,
376, // TROPIUS [SPECIES_TROPIUS - 277] = 376,
382, // WHISMUR [SPECIES_WHISMUR - 277] = 382,
380, // LOUDRED [SPECIES_LOUDRED - 277] = 380,
379, // EXPLOUD [SPECIES_EXPLOUD - 277] = 379,
341, // CLAMPERL [SPECIES_CLAMPERL - 277] = 341,
342, // HUNTAIL [SPECIES_HUNTAIL - 277] = 342,
343, // GOREBYSS [SPECIES_GOREBYSS - 277] = 343,
335, // ABSOL [SPECIES_ABSOL - 277] = 335,
282, // SHUPPET [SPECIES_SHUPPET - 277] = 282,
281, // BANETTE [SPECIES_BANETTE - 277] = 281,
259, // SEVIPER [SPECIES_SEVIPER - 277] = 259,
261, // ZANGOOSE [SPECIES_ZANGOOSE - 277] = 261,
367, // RELICANTH [SPECIES_RELICANTH - 277] = 367,
364, // ARON [SPECIES_ARON - 277] = 364,
365, // LAIRON [SPECIES_LAIRON - 277] = 365,
366, // AGGRON [SPECIES_AGGRON - 277] = 366,
356, // CASTFORM [SPECIES_CASTFORM - 277] = 356,
357, // VOLBEAT [SPECIES_VOLBEAT - 277] = 357,
358, // ILLUMISE [SPECIES_ILLUMISE - 277] = 358,
344, // LILEEP [SPECIES_LILEEP - 277] = 344,
345, // CRADILY [SPECIES_CRADILY - 277] = 345,
346, // ANORITH [SPECIES_ANORITH - 277] = 346,
347, // ARMALDO [SPECIES_ARMALDO - 277] = 347,
295, // RALTS [SPECIES_RALTS - 277] = 295,
296, // KIRLIA [SPECIES_KIRLIA - 277] = 296,
297, // GARDEVOIR [SPECIES_GARDEVOIR - 277] = 297,
351, // BAGON [SPECIES_BAGON - 277] = 351,
352, // SHELGON [SPECIES_SHELGON - 277] = 352,
372, // SALAMENCE [SPECIES_SALAMENCE - 277] = 372,
348, // BELDUM [SPECIES_BELDUM - 277] = 348,
349, // METANG [SPECIES_METANG - 277] = 349,
350, // METAGROSS [SPECIES_METAGROSS - 277] = 350,
353, // REGIROCK [SPECIES_REGIROCK - 277] = 353,
354, // REGICE [SPECIES_REGICE - 277] = 354,
355, // REGISTEEL [SPECIES_REGISTEEL - 277] = 355,
370, // KYOGRE [SPECIES_KYOGRE - 277] = 370,
369, // GROUDON [SPECIES_GROUDON - 277] = 369,
371, // RAYQUAZA [SPECIES_RAYQUAZA - 277] = 371,
257, // LATIAS [SPECIES_LATIAS - 277] = 257,
384, // LATIOS [SPECIES_LATIOS - 277] = 384,
385, // JIRACHI [SPECIES_JIRACHI - 277] = 385,
386, // DEOXYS [SPECIES_DEOXYS - 277] = 386,
387 // CHIMECHO [SPECIES_CHIMECHO - 277] = 387,
}; };

2642
src/data/pokemon_graphics/back_pic_coordinates.h
View File

File diff suppressed because it is too large Load Diff

826
src/data/pokemon_graphics/enemy_mon_elevation.h
View File

@ -1,417 +1,419 @@
#include "constants/species.h"
// This determines how much higher above the usual position the enemy Pokémon // This determines how much higher above the usual position the enemy Pokémon
// is during battle. Species that float or fly have nonzero values. // is during battle. Species that float or fly have nonzero values.
const u8 gEnemyMonElevation[] = const u8 gEnemyMonElevation[] =
{ {
0, // 0 [SPECIES_NONE] = 0,
0, // SPECIES_BULBASAUR [SPECIES_BULBASAUR] = 0,
0, // SPECIES_IVYSAUR [SPECIES_IVYSAUR] = 0,
0, // SPECIES_VENUSAUR [SPECIES_VENUSAUR] = 0,
0, // SPECIES_CHARMANDER [SPECIES_CHARMANDER] = 0,
0, // SPECIES_CHARMELEON [SPECIES_CHARMELEON] = 0,
0, // SPECIES_CHARIZARD [SPECIES_CHARIZARD] = 0,
0, // SPECIES_SQUIRTLE [SPECIES_SQUIRTLE] = 0,
0, // SPECIES_WARTORTLE [SPECIES_WARTORTLE] = 0,
0, // SPECIES_BLASTOISE [SPECIES_BLASTOISE] = 0,
0, // SPECIES_CATERPIE [SPECIES_CATERPIE] = 0,
0, // SPECIES_METAPOD [SPECIES_METAPOD] = 0,
8, // SPECIES_BUTTERFREE [SPECIES_BUTTERFREE] = 8,
0, // SPECIES_WEEDLE [SPECIES_WEEDLE] = 0,
0, // SPECIES_KAKUNA [SPECIES_KAKUNA] = 0,
8, // SPECIES_BEEDRILL [SPECIES_BEEDRILL] = 8,
16, // SPECIES_PIDGEY [SPECIES_PIDGEY] = 16,
0, // SPECIES_PIDGEOTTO [SPECIES_PIDGEOTTO] = 0,
4, // SPECIES_PIDGEOT [SPECIES_PIDGEOT] = 4,
0, // SPECIES_RATTATA [SPECIES_RATTATA] = 0,
0, // SPECIES_RATICATE [SPECIES_RATICATE] = 0,
0, // SPECIES_SPEAROW [SPECIES_SPEAROW] = 0,
6, // SPECIES_FEAROW [SPECIES_FEAROW] = 6,
0, // SPECIES_EKANS [SPECIES_EKANS] = 0,
0, // SPECIES_ARBOK [SPECIES_ARBOK] = 0,
0, // SPECIES_PIKACHU [SPECIES_PIKACHU] = 0,
0, // SPECIES_RAICHU [SPECIES_RAICHU] = 0,
0, // SPECIES_SANDSHREW [SPECIES_SANDSHREW] = 0,
0, // SPECIES_SANDSLASH [SPECIES_SANDSLASH] = 0,
0, // SPECIES_NIDORAN_F [SPECIES_NIDORAN_F] = 0,
0, // SPECIES_NIDORINA [SPECIES_NIDORINA] = 0,
0, // SPECIES_NIDOQUEEN [SPECIES_NIDOQUEEN] = 0,
0, // SPECIES_NIDORAN_M [SPECIES_NIDORAN_M] = 0,
0, // SPECIES_NIDORINO [SPECIES_NIDORINO] = 0,
0, // SPECIES_NIDOKING [SPECIES_NIDOKING] = 0,
0, // SPECIES_CLEFAIRY [SPECIES_CLEFAIRY] = 0,
0, // SPECIES_CLEFABLE [SPECIES_CLEFABLE] = 0,
0, // SPECIES_VULPIX [SPECIES_VULPIX] = 0,
0, // SPECIES_NINETALES [SPECIES_NINETALES] = 0,
0, // SPECIES_JIGGLYPUFF [SPECIES_JIGGLYPUFF] = 0,
0, // SPECIES_WIGGLYTUFF [SPECIES_WIGGLYTUFF] = 0,
8, // SPECIES_ZUBAT [SPECIES_ZUBAT] = 8,
8, // SPECIES_GOLBAT [SPECIES_GOLBAT] = 8,
0, // SPECIES_ODDISH [SPECIES_ODDISH] = 0,
0, // SPECIES_GLOOM [SPECIES_GLOOM] = 0,
0, // SPECIES_VILEPLUME [SPECIES_VILEPLUME] = 0,
0, // SPECIES_PARAS [SPECIES_PARAS] = 0,
0, // SPECIES_PARASECT [SPECIES_PARASECT] = 0,
0, // SPECIES_VENONAT [SPECIES_VENONAT] = 0,
8, // SPECIES_VENOMOTH [SPECIES_VENOMOTH] = 8,
0, // SPECIES_DIGLETT [SPECIES_DIGLETT] = 0,
0, // SPECIES_DUGTRIO [SPECIES_DUGTRIO] = 0,
0, // SPECIES_MEOWTH [SPECIES_MEOWTH] = 0,
0, // SPECIES_PERSIAN [SPECIES_PERSIAN] = 0,
0, // SPECIES_PSYDUCK [SPECIES_PSYDUCK] = 0,
0, // SPECIES_GOLDUCK [SPECIES_GOLDUCK] = 0,
0, // SPECIES_MANKEY [SPECIES_MANKEY] = 0,
0, // SPECIES_PRIMEAPE [SPECIES_PRIMEAPE] = 0,
0, // SPECIES_GROWLITHE [SPECIES_GROWLITHE] = 0,
0, // SPECIES_ARCANINE [SPECIES_ARCANINE] = 0,
0, // SPECIES_POLIWAG [SPECIES_POLIWAG] = 0,
0, // SPECIES_POLIWHIRL [SPECIES_POLIWHIRL] = 0,
0, // SPECIES_POLIWRATH [SPECIES_POLIWRATH] = 0,
0, // SPECIES_ABRA [SPECIES_ABRA] = 0,
0, // SPECIES_KADABRA [SPECIES_KADABRA] = 0,
0, // SPECIES_ALAKAZAM [SPECIES_ALAKAZAM] = 0,
0, // SPECIES_MACHOP [SPECIES_MACHOP] = 0,
0, // SPECIES_MACHOKE [SPECIES_MACHOKE] = 0,
0, // SPECIES_MACHAMP [SPECIES_MACHAMP] = 0,
0, // SPECIES_BELLSPROUT [SPECIES_BELLSPROUT] = 0,
0, // SPECIES_WEEPINBELL [SPECIES_WEEPINBELL] = 0,
0, // SPECIES_VICTREEBEL [SPECIES_VICTREEBEL] = 0,
0, // SPECIES_TENTACOOL [SPECIES_TENTACOOL] = 0,
0, // SPECIES_TENTACRUEL [SPECIES_TENTACRUEL] = 0,
16, // SPECIES_GEODUDE [SPECIES_GEODUDE] = 16,
0, // SPECIES_GRAVELER [SPECIES_GRAVELER] = 0,
0, // SPECIES_GOLEM [SPECIES_GOLEM] = 0,
0, // SPECIES_PONYTA [SPECIES_PONYTA] = 0,
0, // SPECIES_RAPIDASH [SPECIES_RAPIDASH] = 0,
0, // SPECIES_SLOWPOKE [SPECIES_SLOWPOKE] = 0,
0, // SPECIES_SLOWBRO [SPECIES_SLOWBRO] = 0,
16, // SPECIES_MAGNEMITE [SPECIES_MAGNEMITE] = 16,
8, // SPECIES_MAGNETON [SPECIES_MAGNETON] = 8,
0, // SPECIES_FARFETCHD [SPECIES_FARFETCHD] = 0,
0, // SPECIES_DODUO [SPECIES_DODUO] = 0,
0, // SPECIES_DODRIO [SPECIES_DODRIO] = 0,
0, // SPECIES_SEEL [SPECIES_SEEL] = 0,
0, // SPECIES_DEWGONG [SPECIES_DEWGONG] = 0,
0, // SPECIES_GRIMER [SPECIES_GRIMER] = 0,
0, // SPECIES_MUK [SPECIES_MUK] = 0,
0, // SPECIES_SHELLDER [SPECIES_SHELLDER] = 0,
0, // SPECIES_CLOYSTER [SPECIES_CLOYSTER] = 0,
4, // SPECIES_GASTLY [SPECIES_GASTLY] = 4,
4, // SPECIES_HAUNTER [SPECIES_HAUNTER] = 4,
0, // SPECIES_GENGAR [SPECIES_GENGAR] = 0,
0, // SPECIES_ONIX [SPECIES_ONIX] = 0,
0, // SPECIES_DROWZEE [SPECIES_DROWZEE] = 0,
0, // SPECIES_HYPNO [SPECIES_HYPNO] = 0,
0, // SPECIES_KRABBY [SPECIES_KRABBY] = 0,
0, // SPECIES_KINGLER [SPECIES_KINGLER] = 0,
10, // SPECIES_VOLTORB [SPECIES_VOLTORB] = 10,
12, // SPECIES_ELECTRODE [SPECIES_ELECTRODE] = 12,
0, // SPECIES_EXEGGCUTE [SPECIES_EXEGGCUTE] = 0,
0, // SPECIES_EXEGGUTOR [SPECIES_EXEGGUTOR] = 0,
0, // SPECIES_CUBONE [SPECIES_CUBONE] = 0,
0, // SPECIES_MAROWAK [SPECIES_MAROWAK] = 0,
0, // SPECIES_HITMONLEE [SPECIES_HITMONLEE] = 0,
0, // SPECIES_HITMONCHAN [SPECIES_HITMONCHAN] = 0,
0, // SPECIES_LICKITUNG [SPECIES_LICKITUNG] = 0,
8, // SPECIES_KOFFING [SPECIES_KOFFING] = 8,
6, // SPECIES_WEEZING [SPECIES_WEEZING] = 6,
0, // SPECIES_RHYHORN [SPECIES_RHYHORN] = 0,
0, // SPECIES_RHYDON [SPECIES_RHYDON] = 0,
0, // SPECIES_CHANSEY [SPECIES_CHANSEY] = 0,
0, // SPECIES_TANGELA [SPECIES_TANGELA] = 0,
0, // SPECIES_KANGASKHAN [SPECIES_KANGASKHAN] = 0,
0, // SPECIES_HORSEA [SPECIES_HORSEA] = 0,
0, // SPECIES_SEADRA [SPECIES_SEADRA] = 0,
0, // SPECIES_GOLDEEN [SPECIES_GOLDEEN] = 0,
0, // SPECIES_SEAKING [SPECIES_SEAKING] = 0,
0, // SPECIES_STARYU [SPECIES_STARYU] = 0,
0, // SPECIES_STARMIE [SPECIES_STARMIE] = 0,
0, // SPECIES_MR_MIME [SPECIES_MR_MIME] = 0,
0, // SPECIES_SCYTHER [SPECIES_SCYTHER] = 0,
0, // SPECIES_JYNX [SPECIES_JYNX] = 0,
0, // SPECIES_ELECTABUZZ [SPECIES_ELECTABUZZ] = 0,
0, // SPECIES_MAGMAR [SPECIES_MAGMAR] = 0,
0, // SPECIES_PINSIR [SPECIES_PINSIR] = 0,
0, // SPECIES_TAUROS [SPECIES_TAUROS] = 0,
0, // SPECIES_MAGIKARP [SPECIES_MAGIKARP] = 0,
0, // SPECIES_GYARADOS [SPECIES_GYARADOS] = 0,
0, // SPECIES_LAPRAS [SPECIES_LAPRAS] = 0,
0, // SPECIES_DITTO [SPECIES_DITTO] = 0,
0, // SPECIES_EEVEE [SPECIES_EEVEE] = 0,
0, // SPECIES_VAPOREON [SPECIES_VAPOREON] = 0,
0, // SPECIES_JOLTEON [SPECIES_JOLTEON] = 0,
0, // SPECIES_FLAREON [SPECIES_FLAREON] = 0,
0, // SPECIES_PORYGON [SPECIES_PORYGON] = 0,
0, // SPECIES_OMANYTE [SPECIES_OMANYTE] = 0,
0, // SPECIES_OMASTAR [SPECIES_OMASTAR] = 0,
0, // SPECIES_KABUTO [SPECIES_KABUTO] = 0,
0, // SPECIES_KABUTOPS [SPECIES_KABUTOPS] = 0,
7, // SPECIES_AERODACTYL [SPECIES_AERODACTYL] = 7,
0, // SPECIES_SNORLAX [SPECIES_SNORLAX] = 0,
6, // SPECIES_ARTICUNO [SPECIES_ARTICUNO] = 6,
8, // SPECIES_ZAPDOS [SPECIES_ZAPDOS] = 8,
5, // SPECIES_MOLTRES [SPECIES_MOLTRES] = 5,
0, // SPECIES_DRATINI [SPECIES_DRATINI] = 0,
0, // SPECIES_DRAGONAIR [SPECIES_DRAGONAIR] = 0,
6, // SPECIES_DRAGONITE [SPECIES_DRAGONITE] = 6,
0, // SPECIES_MEWTWO [SPECIES_MEWTWO] = 0,
8, // SPECIES_MEW [SPECIES_MEW] = 8,
0, // SPECIES_CHIKORITA [SPECIES_CHIKORITA] = 0,
0, // SPECIES_BAYLEEF [SPECIES_BAYLEEF] = 0,
0, // SPECIES_MEGANIUM [SPECIES_MEGANIUM] = 0,
0, // SPECIES_CYNDAQUIL [SPECIES_CYNDAQUIL] = 0,
0, // SPECIES_QUILAVA [SPECIES_QUILAVA] = 0,
0, // SPECIES_TYPHLOSION [SPECIES_TYPHLOSION] = 0,
0, // SPECIES_TOTODILE [SPECIES_TOTODILE] = 0,
0, // SPECIES_CROCONAW [SPECIES_CROCONAW] = 0,
0, // SPECIES_FERALIGATR [SPECIES_FERALIGATR] = 0,
0, // SPECIES_SENTRET [SPECIES_SENTRET] = 0,
0, // SPECIES_FURRET [SPECIES_FURRET] = 0,
0, // SPECIES_HOOTHOOT [SPECIES_HOOTHOOT] = 0,
0, // SPECIES_NOCTOWL [SPECIES_NOCTOWL] = 0,
0, // SPECIES_LEDYBA [SPECIES_LEDYBA] = 0,
8, // SPECIES_LEDIAN [SPECIES_LEDIAN] = 8,
0, // SPECIES_SPINARAK [SPECIES_SPINARAK] = 0,
0, // SPECIES_ARIADOS [SPECIES_ARIADOS] = 0,
6, // SPECIES_CROBAT [SPECIES_CROBAT] = 6,
0, // SPECIES_CHINCHOU [SPECIES_CHINCHOU] = 0,
0, // SPECIES_LANTURN [SPECIES_LANTURN] = 0,
0, // SPECIES_PICHU [SPECIES_PICHU] = 0,
0, // SPECIES_CLEFFA [SPECIES_CLEFFA] = 0,
0, // SPECIES_IGGLYBUFF [SPECIES_IGGLYBUFF] = 0,
0, // SPECIES_TOGEPI [SPECIES_TOGEPI] = 0,
0, // SPECIES_TOGETIC [SPECIES_TOGETIC] = 0,
0, // SPECIES_NATU [SPECIES_NATU] = 0,
0, // SPECIES_XATU [SPECIES_XATU] = 0,
0, // SPECIES_MAREEP [SPECIES_MAREEP] = 0,
0, // SPECIES_FLAAFFY [SPECIES_FLAAFFY] = 0,
0, // SPECIES_AMPHAROS [SPECIES_AMPHAROS] = 0,
0, // SPECIES_BELLOSSOM [SPECIES_BELLOSSOM] = 0,
0, // SPECIES_MARILL [SPECIES_MARILL] = 0,
0, // SPECIES_AZUMARILL [SPECIES_AZUMARILL] = 0,
0, // SPECIES_SUDOWOODO [SPECIES_SUDOWOODO] = 0,
0, // SPECIES_POLITOED [SPECIES_POLITOED] = 0,
11, // SPECIES_HOPPIP [SPECIES_HOPPIP] = 11,
12, // SPECIES_SKIPLOOM [SPECIES_SKIPLOOM] = 12,
9, // SPECIES_JUMPLUFF [SPECIES_JUMPLUFF] = 9,
0, // SPECIES_AIPOM [SPECIES_AIPOM] = 0,
0, // SPECIES_SUNKERN [SPECIES_SUNKERN] = 0,
0, // SPECIES_SUNFLORA [SPECIES_SUNFLORA] = 0,
8, // SPECIES_YANMA [SPECIES_YANMA] = 8,
0, // SPECIES_WOOPER [SPECIES_WOOPER] = 0,
0, // SPECIES_QUAGSIRE [SPECIES_QUAGSIRE] = 0,
0, // SPECIES_ESPEON [SPECIES_ESPEON] = 0,
0, // SPECIES_UMBREON [SPECIES_UMBREON] = 0,
0, // SPECIES_MURKROW [SPECIES_MURKROW] = 0,
0, // SPECIES_SLOWKING [SPECIES_SLOWKING] = 0,
8, // SPECIES_MISDREAVUS [SPECIES_MISDREAVUS] = 8,
8, // SPECIES_UNOWN [SPECIES_UNOWN] = 8,
0, // SPECIES_WOBBUFFET [SPECIES_WOBBUFFET] = 0,
0, // SPECIES_GIRAFARIG [SPECIES_GIRAFARIG] = 0,
0, // SPECIES_PINECO [SPECIES_PINECO] = 0,
0, // SPECIES_FORRETRESS [SPECIES_FORRETRESS] = 0,
0, // SPECIES_DUNSPARCE [SPECIES_DUNSPARCE] = 0,
6, // SPECIES_GLIGAR [SPECIES_GLIGAR] = 6,
0, // SPECIES_STEELIX [SPECIES_STEELIX] = 0,
0, // SPECIES_SNUBBULL [SPECIES_SNUBBULL] = 0,
0, // SPECIES_GRANBULL [SPECIES_GRANBULL] = 0,
0, // SPECIES_QWILFISH [SPECIES_QWILFISH] = 0,
0, // SPECIES_SCIZOR [SPECIES_SCIZOR] = 0,
0, // SPECIES_SHUCKLE [SPECIES_SHUCKLE] = 0,
0, // SPECIES_HERACROSS [SPECIES_HERACROSS] = 0,
0, // SPECIES_SNEASEL [SPECIES_SNEASEL] = 0,
0, // SPECIES_TEDDIURSA [SPECIES_TEDDIURSA] = 0,
0, // SPECIES_URSARING [SPECIES_URSARING] = 0,
0, // SPECIES_SLUGMA [SPECIES_SLUGMA] = 0,
0, // SPECIES_MAGCARGO [SPECIES_MAGCARGO] = 0,
0, // SPECIES_SWINUB [SPECIES_SWINUB] = 0,
0, // SPECIES_PILOSWINE [SPECIES_PILOSWINE] = 0,
0, // SPECIES_CORSOLA [SPECIES_CORSOLA] = 0,
0, // SPECIES_REMORAID [SPECIES_REMORAID] = 0,
0, // SPECIES_OCTILLERY [SPECIES_OCTILLERY] = 0,
0, // SPECIES_DELIBIRD [SPECIES_DELIBIRD] = 0,
0, // SPECIES_MANTINE [SPECIES_MANTINE] = 0,
0, // SPECIES_SKARMORY [SPECIES_SKARMORY] = 0,
0, // SPECIES_HOUNDOUR [SPECIES_HOUNDOUR] = 0,
0, // SPECIES_HOUNDOOM [SPECIES_HOUNDOOM] = 0,
0, // SPECIES_KINGDRA [SPECIES_KINGDRA] = 0,
0, // SPECIES_PHANPY [SPECIES_PHANPY] = 0,
0, // SPECIES_DONPHAN [SPECIES_DONPHAN] = 0,
0, // SPECIES_PORYGON2 [SPECIES_PORYGON2] = 0,
0, // SPECIES_STANTLER [SPECIES_STANTLER] = 0,
0, // SPECIES_SMEARGLE [SPECIES_SMEARGLE] = 0,
0, // SPECIES_TYROGUE [SPECIES_TYROGUE] = 0,
0, // SPECIES_HITMONTOP [SPECIES_HITMONTOP] = 0,
0, // SPECIES_SMOOCHUM [SPECIES_SMOOCHUM] = 0,
0, // SPECIES_ELEKID [SPECIES_ELEKID] = 0,
0, // SPECIES_MAGBY [SPECIES_MAGBY] = 0,
0, // SPECIES_MILTANK [SPECIES_MILTANK] = 0,
0, // SPECIES_BLISSEY [SPECIES_BLISSEY] = 0,
0, // SPECIES_RAIKOU [SPECIES_RAIKOU] = 0,
0, // SPECIES_ENTEI [SPECIES_ENTEI] = 0,
0, // SPECIES_SUICUNE [SPECIES_SUICUNE] = 0,
0, // SPECIES_LARVITAR [SPECIES_LARVITAR] = 0,
0, // SPECIES_PUPITAR [SPECIES_PUPITAR] = 0,
0, // SPECIES_TYRANITAR [SPECIES_TYRANITAR] = 0,
6, // SPECIES_LUGIA [SPECIES_LUGIA] = 6,
6, // SPECIES_HO_OH [SPECIES_HO_OH] = 6,
15, // SPECIES_CELEBI [SPECIES_CELEBI] = 15,
0, // 252 [SPECIES_OLD_UNOWN_B] = 0,
0, // 253 [SPECIES_OLD_UNOWN_C] = 0,
0, // 254 [SPECIES_OLD_UNOWN_D] = 0,
0, // 255 [SPECIES_OLD_UNOWN_E] = 0,
0, // 256 [SPECIES_OLD_UNOWN_F] = 0,
0, // 257 [SPECIES_OLD_UNOWN_G] = 0,
0, // 258 [SPECIES_OLD_UNOWN_H] = 0,
0, // 259 [SPECIES_OLD_UNOWN_I] = 0,
0, // 260 [SPECIES_OLD_UNOWN_J] = 0,
0, // 261 [SPECIES_OLD_UNOWN_K] = 0,
0, // 262 [SPECIES_OLD_UNOWN_L] = 0,
0, // 263 [SPECIES_OLD_UNOWN_M] = 0,
0, // 264 [SPECIES_OLD_UNOWN_N] = 0,
0, // 265 [SPECIES_OLD_UNOWN_O] = 0,
0, // 266 [SPECIES_OLD_UNOWN_P] = 0,
0, // 267 [SPECIES_OLD_UNOWN_Q] = 0,
0, // 268 [SPECIES_OLD_UNOWN_R] = 0,
0, // 269 [SPECIES_OLD_UNOWN_S] = 0,
0, // 270 [SPECIES_OLD_UNOWN_T] = 0,
0, // 271 [SPECIES_OLD_UNOWN_U] = 0,
0, // 272 [SPECIES_OLD_UNOWN_V] = 0,
0, // 273 [SPECIES_OLD_UNOWN_W] = 0,
0, // 274 [SPECIES_OLD_UNOWN_X] = 0,
0, // 275 [SPECIES_OLD_UNOWN_Y] = 0,
0, // 276 [SPECIES_OLD_UNOWN_Z] = 0,
0, // SPECIES_TREECKO [SPECIES_TREECKO] = 0,
0, // SPECIES_GROVYLE [SPECIES_GROVYLE] = 0,
0, // SPECIES_SCEPTILE [SPECIES_SCEPTILE] = 0,
0, // SPECIES_TORCHIC [SPECIES_TORCHIC] = 0,
0, // SPECIES_COMBUSKEN [SPECIES_COMBUSKEN] = 0,
0, // SPECIES_BLAZIKEN [SPECIES_BLAZIKEN] = 0,
0, // SPECIES_MUDKIP [SPECIES_MUDKIP] = 0,
0, // SPECIES_MARSHTOMP [SPECIES_MARSHTOMP] = 0,
0, // SPECIES_SWAMPERT [SPECIES_SWAMPERT] = 0,
0, // SPECIES_POOCHYENA [SPECIES_POOCHYENA] = 0,
0, // SPECIES_MIGHTYENA [SPECIES_MIGHTYENA] = 0,
0, // SPECIES_ZIGZAGOON [SPECIES_ZIGZAGOON] = 0,
0, // SPECIES_LINOONE [SPECIES_LINOONE] = 0,
0, // SPECIES_WURMPLE [SPECIES_WURMPLE] = 0,
0, // SPECIES_SILCOON [SPECIES_SILCOON] = 0,
8, // SPECIES_BEAUTIFLY [SPECIES_BEAUTIFLY] = 8,
0, // SPECIES_CASCOON [SPECIES_CASCOON] = 0,
10, // SPECIES_DUSTOX [SPECIES_DUSTOX] = 10,
0, // SPECIES_LOTAD [SPECIES_LOTAD] = 0,
0, // SPECIES_LOMBRE [SPECIES_LOMBRE] = 0,
0, // SPECIES_LUDICOLO [SPECIES_LUDICOLO] = 0,
0, // SPECIES_SEEDOT [SPECIES_SEEDOT] = 0,
0, // SPECIES_NUZLEAF [SPECIES_NUZLEAF] = 0,
0, // SPECIES_SHIFTRY [SPECIES_SHIFTRY] = 0,
0, // SPECIES_NINCADA [SPECIES_NINCADA] = 0,
10, // SPECIES_NINJASK [SPECIES_NINJASK] = 10,
8, // SPECIES_SHEDINJA [SPECIES_SHEDINJA] = 8,
0, // SPECIES_TAILLOW [SPECIES_TAILLOW] = 0,
0, // SPECIES_SWELLOW [SPECIES_SWELLOW] = 0,
0, // SPECIES_SHROOMISH [SPECIES_SHROOMISH] = 0,
0, // SPECIES_BRELOOM [SPECIES_BRELOOM] = 0,
0, // SPECIES_SPINDA [SPECIES_SPINDA] = 0,
16, // SPECIES_WINGULL [SPECIES_WINGULL] = 16,
8, // SPECIES_PELIPPER [SPECIES_PELIPPER] = 8,
0, // SPECIES_SURSKIT [SPECIES_SURSKIT] = 0,
10, // SPECIES_MASQUERAIN [SPECIES_MASQUERAIN] = 10,
0, // SPECIES_WAILMER [SPECIES_WAILMER] = 0,
0, // SPECIES_WAILORD [SPECIES_WAILORD] = 0,
0, // SPECIES_SKITTY [SPECIES_SKITTY] = 0,
0, // SPECIES_DELCATTY [SPECIES_DELCATTY] = 0,
0, // SPECIES_KECLEON [SPECIES_KECLEON] = 0,
4, // SPECIES_BALTOY [SPECIES_BALTOY] = 4,
10, // SPECIES_CLAYDOL [SPECIES_CLAYDOL] = 10,
0, // SPECIES_NOSEPASS [SPECIES_NOSEPASS] = 0,
0, // SPECIES_TORKOAL [SPECIES_TORKOAL] = 0,
0, // SPECIES_SABLEYE [SPECIES_SABLEYE] = 0,
0, // SPECIES_BARBOACH [SPECIES_BARBOACH] = 0,
0, // SPECIES_WHISCASH [SPECIES_WHISCASH] = 0,
0, // SPECIES_LUVDISC [SPECIES_LUVDISC] = 0,
0, // SPECIES_CORPHISH [SPECIES_CORPHISH] = 0,
0, // SPECIES_CRAWDAUNT [SPECIES_CRAWDAUNT] = 0,
0, // SPECIES_FEEBAS [SPECIES_FEEBAS] = 0,
0, // SPECIES_MILOTIC [SPECIES_MILOTIC] = 0,
0, // SPECIES_CARVANHA [SPECIES_CARVANHA] = 0,
0, // SPECIES_SHARPEDO [SPECIES_SHARPEDO] = 0,
0, // SPECIES_TRAPINCH [SPECIES_TRAPINCH] = 0,
0, // SPECIES_VIBRAVA [SPECIES_VIBRAVA] = 0,
7, // SPECIES_FLYGON [SPECIES_FLYGON] = 7,
0, // SPECIES_MAKUHITA [SPECIES_MAKUHITA] = 0,
0, // SPECIES_HARIYAMA [SPECIES_HARIYAMA] = 0,
0, // SPECIES_ELECTRIKE [SPECIES_ELECTRIKE] = 0,
0, // SPECIES_MANECTRIC [SPECIES_MANECTRIC] = 0,
0, // SPECIES_NUMEL [SPECIES_NUMEL] = 0,
0, // SPECIES_CAMERUPT [SPECIES_CAMERUPT] = 0,
0, // SPECIES_SPHEAL [SPECIES_SPHEAL] = 0,
0, // SPECIES_SEALEO [SPECIES_SEALEO] = 0,
0, // SPECIES_WALREIN [SPECIES_WALREIN] = 0,
0, // SPECIES_CACNEA [SPECIES_CACNEA] = 0,
0, // SPECIES_CACTURNE [SPECIES_CACTURNE] = 0,
0, // SPECIES_SNORUNT [SPECIES_SNORUNT] = 0,
12, // SPECIES_GLALIE [SPECIES_GLALIE] = 12,
13, // SPECIES_LUNATONE [SPECIES_LUNATONE] = 13,
4, // SPECIES_SOLROCK [SPECIES_SOLROCK] = 4,
0, // SPECIES_AZURILL [SPECIES_AZURILL] = 0,
0, // SPECIES_SPOINK [SPECIES_SPOINK] = 0,
0, // SPECIES_GRUMPIG [SPECIES_GRUMPIG] = 0,
0, // SPECIES_PLUSLE [SPECIES_PLUSLE] = 0,
0, // SPECIES_MINUN [SPECIES_MINUN] = 0,
0, // SPECIES_MAWILE [SPECIES_MAWILE] = 0,
0, // SPECIES_MEDITITE [SPECIES_MEDITITE] = 0,
0, // SPECIES_MEDICHAM [SPECIES_MEDICHAM] = 0,
12, // SPECIES_SWABLU [SPECIES_SWABLU] = 12,
8, // SPECIES_ALTARIA [SPECIES_ALTARIA] = 8,
0, // SPECIES_WYNAUT [SPECIES_WYNAUT] = 0,
9, // SPECIES_DUSKULL [SPECIES_DUSKULL] = 9,
0, // SPECIES_DUSCLOPS [SPECIES_DUSCLOPS] = 0,
0, // SPECIES_ROSELIA [SPECIES_ROSELIA] = 0,
0, // SPECIES_SLAKOTH [SPECIES_SLAKOTH] = 0,
0, // SPECIES_VIGOROTH [SPECIES_VIGOROTH] = 0,
0, // SPECIES_SLAKING [SPECIES_SLAKING] = 0,
0, // SPECIES_GULPIN [SPECIES_GULPIN] = 0,
0, // SPECIES_SWALOT [SPECIES_SWALOT] = 0,
0, // SPECIES_TROPIUS [SPECIES_TROPIUS] = 0,
0, // SPECIES_WHISMUR [SPECIES_WHISMUR] = 0,
0, // SPECIES_LOUDRED [SPECIES_LOUDRED] = 0,
0, // SPECIES_EXPLOUD [SPECIES_EXPLOUD] = 0,
0, // SPECIES_CLAMPERL [SPECIES_CLAMPERL] = 0,
0, // SPECIES_HUNTAIL [SPECIES_HUNTAIL] = 0,
0, // SPECIES_GOREBYSS [SPECIES_GOREBYSS] = 0,
0, // SPECIES_ABSOL [SPECIES_ABSOL] = 0,
12, // SPECIES_SHUPPET [SPECIES_SHUPPET] = 12,
8, // SPECIES_BANETTE [SPECIES_BANETTE] = 8,
0, // SPECIES_SEVIPER [SPECIES_SEVIPER] = 0,
0, // SPECIES_ZANGOOSE [SPECIES_ZANGOOSE] = 0,
0, // SPECIES_RELICANTH [SPECIES_RELICANTH] = 0,
0, // SPECIES_ARON [SPECIES_ARON] = 0,
0, // SPECIES_LAIRON [SPECIES_LAIRON] = 0,
0, // SPECIES_AGGRON [SPECIES_AGGRON] = 0,
16, // SPECIES_CASTFORM [SPECIES_CASTFORM] = 16,
0, // SPECIES_VOLBEAT [SPECIES_VOLBEAT] = 0,
0, // SPECIES_ILLUMISE [SPECIES_ILLUMISE] = 0,
0, // SPECIES_LILEEP [SPECIES_LILEEP] = 0,
0, // SPECIES_CRADILY [SPECIES_CRADILY] = 0,
0, // SPECIES_ANORITH [SPECIES_ANORITH] = 0,
0, // SPECIES_ARMALDO [SPECIES_ARMALDO] = 0,
0, // SPECIES_RALTS [SPECIES_RALTS] = 0,
0, // SPECIES_KIRLIA [SPECIES_KIRLIA] = 0,
0, // SPECIES_GARDEVOIR [SPECIES_GARDEVOIR] = 0,
0, // SPECIES_BAGON [SPECIES_BAGON] = 0,
0, // SPECIES_SHELGON [SPECIES_SHELGON] = 0,
0, // SPECIES_SALAMENCE [SPECIES_SALAMENCE] = 0,
8, // SPECIES_BELDUM [SPECIES_BELDUM] = 8,
0, // SPECIES_METANG [SPECIES_METANG] = 0,
0, // SPECIES_METAGROSS [SPECIES_METAGROSS] = 0,
0, // SPECIES_REGIROCK [SPECIES_REGIROCK] = 0,
0, // SPECIES_REGICE [SPECIES_REGICE] = 0,
0, // SPECIES_REGISTEEL [SPECIES_REGISTEEL] = 0,
0, // SPECIES_KYOGRE [SPECIES_KYOGRE] = 0,
0, // SPECIES_GROUDON [SPECIES_GROUDON] = 0,
6, // SPECIES_RAYQUAZA [SPECIES_RAYQUAZA] = 6,
6, // SPECIES_LATIAS [SPECIES_LATIAS] = 6,
6, // SPECIES_LATIOS [SPECIES_LATIOS] = 6,
12, // SPECIES_JIRACHI [SPECIES_JIRACHI] = 12,
8, // SPECIES_DEOXYS [SPECIES_DEOXYS] = 8,
12, // SPECIES_CHIMECHO [SPECIES_CHIMECHO] = 12,
}; };

2642
src/data/pokemon_graphics/front_pic_coordinates.h
View File

File diff suppressed because it is too large Load Diff

2
src/data/text/item_descriptions.h
View File

@ -7,7 +7,7 @@ const u8 gPokeBallItemDescription[] = _("A tool used for\ncatching wild\nPOKéMO
const u8 gSafariBallItemDescription[] = _("A special BALL that\nis used only in the\nSAFARI ZONE."); const u8 gSafariBallItemDescription[] = _("A special BALL that\nis used only in the\nSAFARI ZONE.");
const u8 gNetBallItemDescription[] = _("A BALL that works\nwell on WATER- and\nBUG-type POKéMON."); const u8 gNetBallItemDescription[] = _("A BALL that works\nwell on WATER- and\nBUG-type POKéMON.");
const u8 gDiveBallItemDescription[] = _("A BALL that works\nbetter on POKéMON\non the ocean floor."); const u8 gDiveBallItemDescription[] = _("A BALL that works\nbetter on POKéMON\non the ocean floor.");
const u8 gNestBallItemDescription[] = _("A BALL that works\nbetter on weaker\nPOKéMON."); const u8 gNestBallItemDescription[] = _("A BALL that works\nbetter on weaker\nPOKéMON.");
const u8 gRepeatBallItemDescription[] = _("A BALL that works\nbetter on POKéMON\ncaught before."); const u8 gRepeatBallItemDescription[] = _("A BALL that works\nbetter on POKéMON\ncaught before.");
const u8 gTimerBallItemDescription[] = _("A BALL that gains\npower in battles\ntaking many turns."); const u8 gTimerBallItemDescription[] = _("A BALL that gains\npower in battles\ntaking many turns.");
const u8 gLuxuryBallItemDescription[] = _("A cozy BALL that\nmakes POKéMON\nmore friendly."); const u8 gLuxuryBallItemDescription[] = _("A cozy BALL that\nmakes POKéMON\nmore friendly.");

1418
src/data/text/move_descriptions.h
View File

File diff suppressed because it is too large Load Diff

19750
src/data/trainer_parties.h
View File

File diff suppressed because it is too large Load Diff

2
src/data2b.c
View File

@ -1,7 +1,7 @@
#include "global.h" #include "global.h"
#include "data2.h" #include "data2.h"
#include "graphics.h" #include "graphics.h"
#include "malloc.h" #include "alloc.h"
#include "constants/species.h" #include "constants/species.h"
const u16 gUnknown_082FF1D8[] = INCBIN_U16("graphics/link/minigame_digits.gbapal"); const u16 gUnknown_082FF1D8[] = INCBIN_U16("graphics/link/minigame_digits.gbapal");

10
src/daycare.c
View File

@ -532,7 +532,7 @@ static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv)
s32 i, j; s32 i, j;
u8 temp[NUM_STATS]; u8 temp[NUM_STATS];
ivs[selectedIv] = 0xff; ivs[selectedIv] = 0xFF;
for (i = 0; i < NUM_STATS; i++) for (i = 0; i < NUM_STATS; i++)
{ {
temp[i] = ivs[i]; temp[i] = ivs[i];
@ -541,7 +541,7 @@ static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv)
j = 0; j = 0;
for (i = 0; i < NUM_STATS; i++) for (i = 0; i < NUM_STATS; i++)
{ {
if (temp[i] != 0xff) if (temp[i] != 0xFF)
ivs[j++] = temp[i]; ivs[j++] = temp[i];
} }
} }
@ -681,7 +681,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru
{ {
if (sHatchedEggFatherMoves[i] == sHatchedEggEggMoves[j]) if (sHatchedEggFatherMoves[i] == sHatchedEggEggMoves[j])
{ {
if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xffff) if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xFFFF)
DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]); DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]);
break; break;
} }
@ -700,7 +700,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru
{ {
if (sHatchedEggFatherMoves[i] == ItemIdToBattleMoveId(ITEM_TM01_FOCUS_PUNCH + j) && CanMonLearnTMHM(egg, j)) if (sHatchedEggFatherMoves[i] == ItemIdToBattleMoveId(ITEM_TM01_FOCUS_PUNCH + j) && CanMonLearnTMHM(egg, j))
{ {
if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xffff) if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xFFFF)
DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]); DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]);
} }
} }
@ -725,7 +725,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru
{ {
if (sHatchedEggLevelUpMoves[j] != MOVE_NONE && sHatchedEggFinalMoves[i] == sHatchedEggLevelUpMoves[j]) if (sHatchedEggLevelUpMoves[j] != MOVE_NONE && sHatchedEggFinalMoves[i] == sHatchedEggLevelUpMoves[j])
{ {
if (GiveMoveToMon(egg, sHatchedEggFinalMoves[i]) == 0xffff) if (GiveMoveToMon(egg, sHatchedEggFinalMoves[i]) == 0xFFFF)
DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFinalMoves[i]); DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFinalMoves[i]);
break; break;
} }

596
src/decompress.c
View File

@ -2,7 +2,7 @@
#include "decompress.h" #include "decompress.h"
#include "constants/species.h" #include "constants/species.h"
#include "text.h" #include "text.h"
#include "malloc.h" #include "alloc.h"
#include "pokemon.h" #include "pokemon.h"
EWRAM_DATA ALIGNED(4) u8 gDecompressionBuffer[0x4000] = {0}; EWRAM_DATA ALIGNED(4) u8 gDecompressionBuffer[0x4000] = {0};
@ -122,346 +122,346 @@ void sub_803471C()
{ {
asm(".syntax unified\n\ asm(".syntax unified\n\
push {r4-r7,lr}\n\ push {r4-r7,lr}\n\
mov r7, r10\n\ mov r7, r10\n\
mov r6, r9\n\ mov r6, r9\n\
mov r5, r8\n\ mov r5, r8\n\
push {r5-r7}\n\ push {r5-r7}\n\
sub sp, 0x24\n\ sub sp, 0x24\n\
mov r9, r0\n\ mov r9, r0\n\
str r1, [sp]\n\ str r1, [sp]\n\
str r2, [sp, 0x4]\n\ str r2, [sp, 0x4]\n\
adds r5, r3, 0\n\ adds r5, r3, 0\n\
movs r0, 0x1\n\ movs r0, 0x1\n\
mov r1, r9\n\ mov r1, r9\n\
ands r0, r1\n\ ands r0, r1\n\
cmp r0, 0\n\ cmp r0, 0\n\
bne _0803473C\n\ bne _0803473C\n\
b _080348D4\n\ b _080348D4\n\
_0803473C:\n\ _0803473C:\n\
asrs r0, r1, 1\n\ asrs r0, r1, 1\n\
adds r0, 0x4\n\ adds r0, 0x4\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r0, 24\n\ lsrs r0, 24\n\
str r0, [sp, 0x8]\n\ str r0, [sp, 0x8]\n\
movs r0, 0\n\ movs r0, 0\n\
ldr r2, [sp]\n\ ldr r2, [sp]\n\
cmp r0, r2\n\ cmp r0, r2\n\
blt _08034750\n\ blt _08034750\n\
b _08034964\n\ b _08034964\n\
_08034750:\n\ _08034750:\n\
movs r4, 0x8\n\ movs r4, 0x8\n\
subs r1, r4, r1\n\ subs r1, r4, r1\n\
str r1, [sp, 0x10]\n\ str r1, [sp, 0x10]\n\
_08034756:\n\ _08034756:\n\
movs r7, 0\n\ movs r7, 0\n\
adds r0, 0x1\n\ adds r0, 0x1\n\
str r0, [sp, 0x14]\n\ str r0, [sp, 0x14]\n\
ldr r0, [sp, 0x10]\n\ ldr r0, [sp, 0x10]\n\
cmp r7, r0\n\ cmp r7, r0\n\
bge _080347D2\n\ bge _080347D2\n\
ldr r1, [sp, 0x8]\n\ ldr r1, [sp, 0x8]\n\
lsls r1, 8\n\ lsls r1, 8\n\
str r1, [sp, 0x18]\n\ str r1, [sp, 0x18]\n\
movs r2, 0\n\ movs r2, 0\n\
mov r10, r2\n\ mov r10, r2\n\
mov r0, r9\n\ mov r0, r9\n\
movs r4, 0x8\n\ movs r4, 0x8\n\
subs r0, r4, r0\n\ subs r0, r4, r0\n\
str r0, [sp, 0xC]\n\ str r0, [sp, 0xC]\n\
_08034774:\n\ _08034774:\n\
movs r3, 0\n\ movs r3, 0\n\
asrs r0, r7, 1\n\ asrs r0, r7, 1\n\
adds r1, r7, 0\n\ adds r1, r7, 0\n\
movs r2, 0x1\n\ movs r2, 0x1\n\
ands r1, r2\n\ ands r1, r2\n\
str r1, [sp, 0x20]\n\ str r1, [sp, 0x20]\n\
lsls r0, 8\n\ lsls r0, 8\n\
mov r8, r0\n\ mov r8, r0\n\
mov r12, r5\n\ mov r12, r5\n\
_08034786:\n\ _08034786:\n\
lsls r1, r3, 5\n\ lsls r1, r3, 5\n\
ldr r4, [sp, 0x18]\n\ ldr r4, [sp, 0x18]\n\
adds r0, r5, r4\n\ adds r0, r5, r4\n\
adds r0, r1\n\ adds r0, r1\n\
mov r1, r8\n\ mov r1, r8\n\
adds r2, r0, r1\n\ adds r2, r0, r1\n\
mov r1, r12\n\ mov r1, r12\n\
add r1, r8\n\ add r1, r8\n\
movs r6, 0xF\n\ movs r6, 0xF\n\
_08034798:\n\ _08034798:\n\
ldr r4, [sp, 0x20]\n\ ldr r4, [sp, 0x20]\n\
cmp r4, 0\n\ cmp r4, 0\n\
bne _080347A8\n\ bne _080347A8\n\
strb r4, [r1]\n\ strb r4, [r1]\n\
add r4, sp, 0x20\n\ add r4, sp, 0x20\n\
ldrb r4, [r4]\n\ ldrb r4, [r4]\n\
strb r4, [r2, 0x10]\n\ strb r4, [r2, 0x10]\n\
b _080347B6\n\ b _080347B6\n\
_080347A8:\n\ _080347A8:\n\
mov r0, r10\n\ mov r0, r10\n\
strb r0, [r1, 0x10]\n\ strb r0, [r1, 0x10]\n\
movs r4, 0x80\n\ movs r4, 0x80\n\
lsls r4, 1\n\ lsls r4, 1\n\
adds r4, r2, r4\n\ adds r4, r2, r4\n\
str r4, [sp, 0x1C]\n\ str r4, [sp, 0x1C]\n\
strb r0, [r4]\n\ strb r0, [r4]\n\
_080347B6:\n\ _080347B6:\n\
adds r2, 0x1\n\ adds r2, 0x1\n\
adds r1, 0x1\n\ adds r1, 0x1\n\
subs r6, 0x1\n\ subs r6, 0x1\n\
cmp r6, 0\n\ cmp r6, 0\n\
bge _08034798\n\ bge _08034798\n\
movs r0, 0x20\n\ movs r0, 0x20\n\
add r12, r0\n\ add r12, r0\n\
adds r3, 0x1\n\ adds r3, 0x1\n\
cmp r3, 0x7\n\ cmp r3, 0x7\n\
ble _08034786\n\ ble _08034786\n\
adds r7, 0x1\n\ adds r7, 0x1\n\
ldr r1, [sp, 0xC]\n\ ldr r1, [sp, 0xC]\n\
cmp r7, r1\n\ cmp r7, r1\n\
blt _08034774\n\ blt _08034774\n\
_080347D2:\n\ _080347D2:\n\
movs r7, 0\n\ movs r7, 0\n\
movs r2, 0\n\ movs r2, 0\n\
_080347D6:\n\ _080347D6:\n\
movs r6, 0\n\ movs r6, 0\n\
adds r4, r7, 0x1\n\ adds r4, r7, 0x1\n\
mov r8, r4\n\ mov r8, r4\n\
lsls r4, r7, 5\n\ lsls r4, r7, 5\n\
_080347DE:\n\ _080347DE:\n\
adds r0, r6, 0x1\n\ adds r0, r6, 0x1\n\
mov r10, r0\n\ mov r10, r0\n\
lsls r1, r6, 8\n\ lsls r1, r6, 8\n\
adds r0, r1, 0\n\ adds r0, r1, 0\n\
adds r0, 0xC0\n\ adds r0, 0xC0\n\
adds r0, r5, r0\n\ adds r0, r5, r0\n\
adds r0, r4\n\ adds r0, r4\n\
adds r1, r5, r1\n\ adds r1, r5, r1\n\
adds r1, r4\n\ adds r1, r4\n\
movs r3, 0x1F\n\ movs r3, 0x1F\n\
_080347F2:\n\ _080347F2:\n\
strb r2, [r1]\n\ strb r2, [r1]\n\
strb r2, [r0]\n\ strb r2, [r0]\n\
adds r0, 0x1\n\ adds r0, 0x1\n\
adds r1, 0x1\n\ adds r1, 0x1\n\
subs r3, 0x1\n\ subs r3, 0x1\n\
cmp r3, 0\n\ cmp r3, 0\n\
bge _080347F2\n\ bge _080347F2\n\
mov r6, r10\n\ mov r6, r10\n\
cmp r6, 0x7\n\ cmp r6, 0x7\n\
ble _080347DE\n\ ble _080347DE\n\
mov r7, r8\n\ mov r7, r8\n\
cmp r7, 0x1\n\ cmp r7, 0x1\n\
ble _080347D6\n\ ble _080347D6\n\
mov r1, r9\n\ mov r1, r9\n\
cmp r1, 0x5\n\ cmp r1, 0x5\n\
bne _08034818\n\ bne _08034818\n\
movs r2, 0x90\n\ movs r2, 0x90\n\
lsls r2, 1\n\ lsls r2, 1\n\
adds r5, r2\n\ adds r5, r2\n\
_08034818:\n\ _08034818:\n\
movs r7, 0\n\ movs r7, 0\n\
cmp r7, r9\n\ cmp r7, r9\n\
bge _080348AE\n\ bge _080348AE\n\
_0803481E:\n\ _0803481E:\n\
movs r3, 0\n\ movs r3, 0\n\
adds r7, 0x1\n\ adds r7, 0x1\n\
mov r8, r7\n\ mov r8, r7\n\
cmp r3, r9\n\ cmp r3, r9\n\
bge _0803488E\n\ bge _0803488E\n\
_08034828:\n\ _08034828:\n\
adds r3, 0x1\n\ adds r3, 0x1\n\
mov r10, r3\n\ mov r10, r3\n\
ldr r4, [sp, 0x4]\n\ ldr r4, [sp, 0x4]\n\
adds r4, 0x20\n\ adds r4, 0x20\n\
adds r7, r5, 0\n\ adds r7, r5, 0\n\
adds r7, 0x20\n\ adds r7, 0x20\n\
movs r0, 0x12\n\ movs r0, 0x12\n\
adds r0, r5\n\ adds r0, r5\n\
mov r12, r0\n\ mov r12, r0\n\
ldr r2, [sp, 0x4]\n\ ldr r2, [sp, 0x4]\n\
adds r3, r5, 0\n\ adds r3, r5, 0\n\
movs r6, 0x3\n\ movs r6, 0x3\n\
_08034840:\n\ _08034840:\n\
ldrb r0, [r2]\n\ ldrb r0, [r2]\n\
mov r1, r12\n\ mov r1, r12\n\
strb r0, [r1]\n\ strb r0, [r1]\n\
ldrb r0, [r2, 0x1]\n\ ldrb r0, [r2, 0x1]\n\
strb r0, [r1, 0x1]\n\ strb r0, [r1, 0x1]\n\
ldrb r0, [r2, 0x2]\n\ ldrb r0, [r2, 0x2]\n\
strb r0, [r1, 0x1E]\n\ strb r0, [r1, 0x1E]\n\
ldrb r0, [r2, 0x3]\n\ ldrb r0, [r2, 0x3]\n\
strb r0, [r1, 0x1F]\n\ strb r0, [r1, 0x1F]\n\
movs r0, 0x81\n\ movs r0, 0x81\n\
lsls r0, 1\n\ lsls r0, 1\n\
adds r1, r3, r0\n\ adds r1, r3, r0\n\
ldrb r0, [r2, 0x10]\n\ ldrb r0, [r2, 0x10]\n\
strb r0, [r1]\n\ strb r0, [r1]\n\
ldr r0, =0x00000103\n\ ldr r0, =0x00000103\n\
adds r1, r3, r0\n\ adds r1, r3, r0\n\
ldrb r0, [r2, 0x11]\n\ ldrb r0, [r2, 0x11]\n\
strb r0, [r1]\n\ strb r0, [r1]\n\
movs r0, 0x90\n\ movs r0, 0x90\n\
lsls r0, 1\n\ lsls r0, 1\n\
adds r1, r3, r0\n\ adds r1, r3, r0\n\
ldrb r0, [r2, 0x12]\n\ ldrb r0, [r2, 0x12]\n\
strb r0, [r1]\n\ strb r0, [r1]\n\
ldr r0, =0x00000121\n\ ldr r0, =0x00000121\n\
adds r1, r3, r0\n\ adds r1, r3, r0\n\
ldrb r0, [r2, 0x13]\n\ ldrb r0, [r2, 0x13]\n\
strb r0, [r1]\n\ strb r0, [r1]\n\
movs r1, 0x4\n\ movs r1, 0x4\n\
add r12, r1\n\ add r12, r1\n\
adds r2, 0x4\n\ adds r2, 0x4\n\
adds r3, 0x4\n\ adds r3, 0x4\n\
subs r6, 0x1\n\ subs r6, 0x1\n\
cmp r6, 0\n\ cmp r6, 0\n\
bge _08034840\n\ bge _08034840\n\
str r4, [sp, 0x4]\n\ str r4, [sp, 0x4]\n\
adds r5, r7, 0\n\ adds r5, r7, 0\n\
mov r3, r10\n\ mov r3, r10\n\
cmp r3, r9\n\ cmp r3, r9\n\
blt _08034828\n\ blt _08034828\n\
_0803488E:\n\ _0803488E:\n\
mov r2, r9\n\ mov r2, r9\n\
cmp r2, 0x7\n\ cmp r2, 0x7\n\
bne _080348A0\n\ bne _080348A0\n\
adds r5, 0x20\n\ adds r5, 0x20\n\
b _080348A8\n\ b _080348A8\n\
.pool\n\ .pool\n\
_080348A0:\n\ _080348A0:\n\
mov r4, r9\n\ mov r4, r9\n\
cmp r4, 0x5\n\ cmp r4, 0x5\n\
bne _080348A8\n\ bne _080348A8\n\
adds r5, 0x60\n\ adds r5, 0x60\n\
_080348A8:\n\ _080348A8:\n\
mov r7, r8\n\ mov r7, r8\n\
cmp r7, r9\n\ cmp r7, r9\n\
blt _0803481E\n\ blt _0803481E\n\
_080348AE:\n\ _080348AE:\n\
mov r0, r9\n\ mov r0, r9\n\
cmp r0, 0x7\n\ cmp r0, 0x7\n\
bne _080348BC\n\ bne _080348BC\n\
movs r1, 0x80\n\ movs r1, 0x80\n\
lsls r1, 1\n\ lsls r1, 1\n\
adds r5, r1\n\ adds r5, r1\n\
b _080348C8\n\ b _080348C8\n\
_080348BC:\n\ _080348BC:\n\
mov r2, r9\n\ mov r2, r9\n\
cmp r2, 0x5\n\ cmp r2, 0x5\n\
bne _080348C8\n\ bne _080348C8\n\
movs r4, 0xF0\n\ movs r4, 0xF0\n\
lsls r4, 1\n\ lsls r4, 1\n\
adds r5, r4\n\ adds r5, r4\n\
_080348C8:\n\ _080348C8:\n\
ldr r0, [sp, 0x14]\n\ ldr r0, [sp, 0x14]\n\
ldr r1, [sp]\n\ ldr r1, [sp]\n\
cmp r0, r1\n\ cmp r0, r1\n\
bge _080348D2\n\ bge _080348D2\n\
b _08034756\n\ b _08034756\n\
_080348D2:\n\ _080348D2:\n\
b _08034964\n\ b _08034964\n\
_080348D4:\n\ _080348D4:\n\
movs r6, 0\n\ movs r6, 0\n\
ldr r2, [sp]\n\ ldr r2, [sp]\n\
cmp r6, r2\n\ cmp r6, r2\n\
bge _08034964\n\ bge _08034964\n\
_080348DC:\n\ _080348DC:\n\
adds r6, 0x1\n\ adds r6, 0x1\n\
mov r10, r6\n\ mov r10, r6\n\
mov r4, r9\n\ mov r4, r9\n\
cmp r4, 0x6\n\ cmp r4, 0x6\n\
bne _080348F4\n\ bne _080348F4\n\
movs r0, 0\n\ movs r0, 0\n\
movs r3, 0xFF\n\ movs r3, 0xFF\n\
_080348EA:\n\ _080348EA:\n\
strb r0, [r5]\n\ strb r0, [r5]\n\
adds r5, 0x1\n\ adds r5, 0x1\n\
subs r3, 0x1\n\ subs r3, 0x1\n\
cmp r3, 0\n\ cmp r3, 0\n\
bge _080348EA\n\ bge _080348EA\n\
_080348F4:\n\ _080348F4:\n\
movs r7, 0\n\ movs r7, 0\n\
cmp r7, r9\n\ cmp r7, r9\n\
bge _08034948\n\ bge _08034948\n\
_080348FA:\n\ _080348FA:\n\
adds r7, 0x1\n\ adds r7, 0x1\n\
mov r8, r7\n\ mov r8, r7\n\
mov r1, r9\n\ mov r1, r9\n\
lsls r0, r1, 5\n\ lsls r0, r1, 5\n\
cmp r1, 0x6\n\ cmp r1, 0x6\n\
bne _08034914\n\ bne _08034914\n\
movs r1, 0\n\ movs r1, 0\n\
movs r3, 0x1F\n\ movs r3, 0x1F\n\
_0803490A:\n\ _0803490A:\n\
strb r1, [r5]\n\ strb r1, [r5]\n\
adds r5, 0x1\n\ adds r5, 0x1\n\
subs r3, 0x1\n\ subs r3, 0x1\n\
cmp r3, 0\n\ cmp r3, 0\n\
bge _0803490A\n\ bge _0803490A\n\
_08034914:\n\ _08034914:\n\
adds r1, r0, 0\n\ adds r1, r0, 0\n\
cmp r1, 0\n\ cmp r1, 0\n\
ble _0803492E\n\ ble _0803492E\n\
adds r3, r1, 0\n\ adds r3, r1, 0\n\
_0803491C:\n\ _0803491C:\n\
ldr r2, [sp, 0x4]\n\ ldr r2, [sp, 0x4]\n\
ldrb r0, [r2]\n\ ldrb r0, [r2]\n\
strb r0, [r5]\n\ strb r0, [r5]\n\
adds r2, 0x1\n\ adds r2, 0x1\n\
str r2, [sp, 0x4]\n\ str r2, [sp, 0x4]\n\
adds r5, 0x1\n\ adds r5, 0x1\n\
subs r3, 0x1\n\ subs r3, 0x1\n\
cmp r3, 0\n\ cmp r3, 0\n\
bne _0803491C\n\ bne _0803491C\n\
_0803492E:\n\ _0803492E:\n\
mov r4, r9\n\ mov r4, r9\n\
cmp r4, 0x6\n\ cmp r4, 0x6\n\
bne _08034942\n\ bne _08034942\n\
movs r0, 0\n\ movs r0, 0\n\
movs r3, 0x1F\n\ movs r3, 0x1F\n\
_08034938:\n\ _08034938:\n\
strb r0, [r5]\n\ strb r0, [r5]\n\
adds r5, 0x1\n\ adds r5, 0x1\n\
subs r3, 0x1\n\ subs r3, 0x1\n\
cmp r3, 0\n\ cmp r3, 0\n\
bge _08034938\n\ bge _08034938\n\
_08034942:\n\ _08034942:\n\
mov r7, r8\n\ mov r7, r8\n\
cmp r7, r9\n\ cmp r7, r9\n\
blt _080348FA\n\ blt _080348FA\n\
_08034948:\n\ _08034948:\n\
mov r0, r9\n\ mov r0, r9\n\
cmp r0, 0x6\n\ cmp r0, 0x6\n\
bne _0803495C\n\ bne _0803495C\n\
movs r0, 0\n\ movs r0, 0\n\
movs r3, 0xFF\n\ movs r3, 0xFF\n\
_08034952:\n\ _08034952:\n\
strb r0, [r5]\n\ strb r0, [r5]\n\
adds r5, 0x1\n\ adds r5, 0x1\n\
subs r3, 0x1\n\ subs r3, 0x1\n\
cmp r3, 0\n\ cmp r3, 0\n\
bge _08034952\n\ bge _08034952\n\
_0803495C:\n\ _0803495C:\n\
mov r6, r10\n\ mov r6, r10\n\
ldr r1, [sp]\n\ ldr r1, [sp]\n\
cmp r6, r1\n\ cmp r6, r1\n\
blt _080348DC\n\ blt _080348DC\n\
_08034964:\n\ _08034964:\n\
add sp, 0x24\n\ add sp, 0x24\n\
pop {r3-r5}\n\ pop {r3-r5}\n\
mov r8, r3\n\ mov r8, r3\n\
mov r9, r4\n\ mov r9, r4\n\
mov r10, r5\n\ mov r10, r5\n\
pop {r4-r7}\n\ pop {r4-r7}\n\
pop {r0}\n\ pop {r0}\n\
bx r0\n\ bx r0\n\
.syntax divided"); .syntax divided");
} }
u32 GetDecompressedDataSize(const u32 *ptr) u32 GetDecompressedDataSize(const u32 *ptr)
{ {
const u8 *ptr8 = (const u8 *)ptr; const u8 *ptr8 = (const u8 *)ptr;
return (ptr8[3] << 16) | (ptr8[2] << 8) | (ptr8[1]); return (ptr8[3] << 16) | (ptr8[2] << 8) | (ptr8[1]);
} }

4
src/decoration.c
View File

@ -1,7 +1,7 @@
#include "global.h" #include "global.h"
#include "constants/decorations.h" #include "constants/decorations.h"
#include "decompress.h" #include "decompress.h"
#include "malloc.h" #include "alloc.h"
#include "text.h" #include "text.h"
#include "string_util.h" #include "string_util.h"
#include "international_string_util.h" #include "international_string_util.h"
@ -312,7 +312,7 @@ const struct SpriteFrameImage sDecorSelectorSpriteFrameImages = {
}; };
const struct SpriteTemplate sDecorSelectorSpriteTemplate = { const struct SpriteTemplate sDecorSelectorSpriteTemplate = {
0xffff, 0xFFFF,
OVERWORLD_PLACE_DECOR_SELECTOR_PAL_TAG, OVERWORLD_PLACE_DECOR_SELECTOR_PAL_TAG,
&sDecorSelectorOam, &sDecorSelectorOam,
sDecorSelectorAnims, sDecorSelectorAnims,

2
src/dewford_trend.c
View File

@ -3,7 +3,7 @@
#include "easy_chat.h" #include "easy_chat.h"
#include "event_data.h" #include "event_data.h"
#include "link.h" #include "link.h"
#include "malloc.h" #include "alloc.h"
#include "random.h" #include "random.h"
#include "text.h" #include "text.h"
#include "tv.h" #include "tv.h"

2
src/diploma.c
View File

@ -5,7 +5,7 @@
#include "gpu_regs.h" #include "gpu_regs.h"
#include "scanline_effect.h" #include "scanline_effect.h"
#include "task.h" #include "task.h"
#include "malloc.h" #include "alloc.h"
#include "decompress.h" #include "decompress.h"
#include "bg.h" #include "bg.h"
#include "window.h" #include "window.h"

2
src/easy_chat.c
View File

@ -1,7 +1,7 @@
// Includes // Includes
#include "global.h" #include "global.h"
#include "malloc.h" #include "alloc.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "sound.h" #include "sound.h"
#include "overworld.h" #include "overworld.h"

2
src/egg_hatch.c
View File

@ -17,7 +17,7 @@
#include "menu.h" #include "menu.h"
#include "trig.h" #include "trig.h"
#include "random.h" #include "random.h"
#include "malloc.h" #include "alloc.h"
#include "dma3.h" #include "dma3.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "bg.h" #include "bg.h"

776
src/event_object_movement.c
View File

@ -9,7 +9,7 @@
#include "field_effect_helpers.h" #include "field_effect_helpers.h"
#include "field_player_avatar.h" #include "field_player_avatar.h"
#include "fieldmap.h" #include "fieldmap.h"
#include "malloc.h" #include "alloc.h"
#include "mauville_old_man.h" #include "mauville_old_man.h"
#include "metatile_behavior.h" #include "metatile_behavior.h"
#include "overworld.h" #include "overworld.h"
@ -142,255 +142,255 @@ void (*const gCameraObjectFuncs[])(struct Sprite *) = {
// movement type callbacks // movement type callbacks
static void (*const sMovementTypeCallbacks[])(struct Sprite *) = static void (*const sMovementTypeCallbacks[])(struct Sprite *) =
{ {
MovementType_None, // MOVEMENT_TYPE_NONE [MOVEMENT_TYPE_NONE] = MovementType_None,
MovementType_LookAround, // MOVEMENT_TYPE_LOOK_AROUND [MOVEMENT_TYPE_LOOK_AROUND] = MovementType_LookAround,
MovementType_WanderAround, // MOVEMENT_TYPE_WANDER_AROUND [MOVEMENT_TYPE_WANDER_AROUND] = MovementType_WanderAround,
MovementType_WanderUpAndDown, // MOVEMENT_TYPE_WANDER_UP_AND_DOWN [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = MovementType_WanderUpAndDown,
MovementType_WanderUpAndDown, // MOVEMENT_TYPE_WANDER_DOWN_AND_UP [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = MovementType_WanderUpAndDown,
MovementType_WanderLeftAndRight, // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = MovementType_WanderLeftAndRight,
MovementType_WanderLeftAndRight, // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = MovementType_WanderLeftAndRight,
MovementType_FaceDirection, // MOVEMENT_TYPE_FACE_UP [MOVEMENT_TYPE_FACE_UP] = MovementType_FaceDirection,
MovementType_FaceDirection, // MOVEMENT_TYPE_FACE_DOWN [MOVEMENT_TYPE_FACE_DOWN] = MovementType_FaceDirection,
MovementType_FaceDirection, // MOVEMENT_TYPE_FACE_LEFT [MOVEMENT_TYPE_FACE_LEFT] = MovementType_FaceDirection,
MovementType_FaceDirection, // MOVEMENT_TYPE_FACE_RIGHT [MOVEMENT_TYPE_FACE_RIGHT] = MovementType_FaceDirection,
MovementType_Player, // MOVEMENT_TYPE_PLAYER [MOVEMENT_TYPE_PLAYER] = MovementType_Player,
MovementType_BerryTreeGrowth, // MOVEMENT_TYPE_BERRY_TREE_GROWTH [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = MovementType_BerryTreeGrowth,
MovementType_FaceDownAndUp, // MOVEMENT_TYPE_FACE_DOWN_AND_UP [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = MovementType_FaceDownAndUp,
MovementType_FaceLeftAndRight, // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = MovementType_FaceLeftAndRight,
MovementType_FaceUpAndLeft, // MOVEMENT_TYPE_FACE_UP_AND_LEFT [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = MovementType_FaceUpAndLeft,
MovementType_FaceUpAndRight, // MOVEMENT_TYPE_FACE_UP_AND_RIGHT [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = MovementType_FaceUpAndRight,
MovementType_FaceDownAndLeft, // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = MovementType_FaceDownAndLeft,
MovementType_FaceDownAndRight, // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = MovementType_FaceDownAndRight,
MovementType_FaceDownUpAndLeft, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = MovementType_FaceDownUpAndLeft,
MovementType_FaceDownUpAndRight, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = MovementType_FaceDownUpAndRight,
MovementType_FaceUpRightAndLeft, // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = MovementType_FaceUpRightAndLeft,
MovementType_FaceDownRightAndLeft, // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = MovementType_FaceDownRightAndLeft,
MovementType_RotateCounterclockwise, // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = MovementType_RotateCounterclockwise,
MovementType_RotateClockwise, // MOVEMENT_TYPE_ROTATE_CLOCKWISE [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = MovementType_RotateClockwise,
MovementType_WalkBackAndForth, // MOVEMENT_TYPE_WALK_UP_AND_DOWN [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = MovementType_WalkBackAndForth,
MovementType_WalkBackAndForth, // MOVEMENT_TYPE_WALK_DOWN_AND_UP [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = MovementType_WalkBackAndForth,
MovementType_WalkBackAndForth, // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = MovementType_WalkBackAndForth,
MovementType_WalkBackAndForth, // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT [MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT] = MovementType_WalkBackAndForth,
MovementType_WalkSequenceUpRightLeftDown, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN] = MovementType_WalkSequenceUpRightLeftDown,
MovementType_WalkSequenceRightLeftDownUp, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP] = MovementType_WalkSequenceRightLeftDownUp,
MovementType_WalkSequenceDownUpRightLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT] = MovementType_WalkSequenceDownUpRightLeft,
MovementType_WalkSequenceLeftDownUpRight, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT] = MovementType_WalkSequenceLeftDownUpRight,
MovementType_WalkSequenceUpLeftRightDown, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN] = MovementType_WalkSequenceUpLeftRightDown,
MovementType_WalkSequenceLeftRightDownUp, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP] = MovementType_WalkSequenceLeftRightDownUp,
MovementType_WalkSequenceDownUpLeftRight, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT] = MovementType_WalkSequenceDownUpLeftRight,
MovementType_WalkSequenceRightDownUpLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT] = MovementType_WalkSequenceRightDownUpLeft,
MovementType_WalkSequenceLeftUpDownRight, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT] = MovementType_WalkSequenceLeftUpDownRight,
MovementType_WalkSequenceUpDownRightLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT] = MovementType_WalkSequenceUpDownRightLeft,
MovementType_WalkSequenceRightLeftUpDown, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN] = MovementType_WalkSequenceRightLeftUpDown,
MovementType_WalkSequenceDownRightLeftUp, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP] = MovementType_WalkSequenceDownRightLeftUp,
MovementType_WalkSequenceRightUpDownLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT] = MovementType_WalkSequenceRightUpDownLeft,
MovementType_WalkSequenceUpDownLeftRight, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT] = MovementType_WalkSequenceUpDownLeftRight,
MovementType_WalkSequenceLeftRightUpDown, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN] = MovementType_WalkSequenceLeftRightUpDown,
MovementType_WalkSequenceDownLeftRightUp, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP] = MovementType_WalkSequenceDownLeftRightUp,
MovementType_WalkSequenceUpLeftDownRight, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT] = MovementType_WalkSequenceUpLeftDownRight,
MovementType_WalkSequenceDownRightUpLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT] = MovementType_WalkSequenceDownRightUpLeft,
MovementType_WalkSequenceLeftDownRightUp, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP] = MovementType_WalkSequenceLeftDownRightUp,
MovementType_WalkSequenceRightUpLeftDown, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN] = MovementType_WalkSequenceRightUpLeftDown,
MovementType_WalkSequenceUpRightDownLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT] = MovementType_WalkSequenceUpRightDownLeft,
MovementType_WalkSequenceDownLeftUpRight, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT] = MovementType_WalkSequenceDownLeftUpRight,
MovementType_WalkSequenceLeftUpRightDown, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN] = MovementType_WalkSequenceLeftUpRightDown,
MovementType_WalkSequenceRightDownLeftUp, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP] = MovementType_WalkSequenceRightDownLeftUp,
MovementType_CopyPlayer, // MOVEMENT_TYPE_COPY_PLAYER [MOVEMENT_TYPE_COPY_PLAYER] = MovementType_CopyPlayer,
MovementType_CopyPlayer, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = MovementType_CopyPlayer,
MovementType_CopyPlayer, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = MovementType_CopyPlayer,
MovementType_CopyPlayer, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = MovementType_CopyPlayer,
MovementType_TreeDisguise, // MOVEMENT_TYPE_TREE_DISGUISE [MOVEMENT_TYPE_TREE_DISGUISE] = MovementType_TreeDisguise,
MovementType_MountainDisguise, // MOVEMENT_TYPE_MOUNTAIN_DISGUISE [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = MovementType_MountainDisguise,
MovementType_CopyPlayerInGrass, // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = MovementType_CopyPlayerInGrass,
MovementType_CopyPlayerInGrass, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = MovementType_CopyPlayerInGrass,
MovementType_CopyPlayerInGrass, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = MovementType_CopyPlayerInGrass,
MovementType_CopyPlayerInGrass, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = MovementType_CopyPlayerInGrass,
MovementType_Hidden, // MOVEMENT_TYPE_HIDDEN [MOVEMENT_TYPE_HIDDEN] = MovementType_Hidden,
MovementType_WalkInPlace, // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN [MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = MovementType_WalkInPlace,
MovementType_WalkInPlace, // MOVEMENT_TYPE_WALK_IN_PLACE_UP [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = MovementType_WalkInPlace,
MovementType_WalkInPlace, // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = MovementType_WalkInPlace,
MovementType_WalkInPlace, // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = MovementType_WalkInPlace,
MovementType_JogInPlace, // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = MovementType_JogInPlace,
MovementType_JogInPlace, // MOVEMENT_TYPE_JOG_IN_PLACE_UP [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = MovementType_JogInPlace,
MovementType_JogInPlace, // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = MovementType_JogInPlace,
MovementType_JogInPlace, // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = MovementType_JogInPlace,
MovementType_RunInPlace, // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN [MOVEMENT_TYPE_RUN_IN_PLACE_DOWN] = MovementType_RunInPlace,
MovementType_RunInPlace, // MOVEMENT_TYPE_RUN_IN_PLACE_UP [MOVEMENT_TYPE_RUN_IN_PLACE_UP] = MovementType_RunInPlace,
MovementType_RunInPlace, // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT [MOVEMENT_TYPE_RUN_IN_PLACE_LEFT] = MovementType_RunInPlace,
MovementType_RunInPlace, // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT [MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT] = MovementType_RunInPlace,
MovementType_Invisible, // MOVEMENT_TYPE_INVISIBLE [MOVEMENT_TYPE_INVISIBLE] = MovementType_Invisible,
MovementType_WalkSlowlyInPlace, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN] = MovementType_WalkSlowlyInPlace,
MovementType_WalkSlowlyInPlace, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP] = MovementType_WalkSlowlyInPlace,
MovementType_WalkSlowlyInPlace, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT] = MovementType_WalkSlowlyInPlace,
MovementType_WalkSlowlyInPlace, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT] = MovementType_WalkSlowlyInPlace,
}; };
const u8 gRangedMovementTypes[] = { const u8 gRangedMovementTypes[] = {
0, // MOVEMENT_TYPE_NONE [MOVEMENT_TYPE_NONE] = 0,
0, // MOVEMENT_TYPE_LOOK_AROUND [MOVEMENT_TYPE_LOOK_AROUND] = 0,
1, // MOVEMENT_TYPE_WANDER_AROUND [MOVEMENT_TYPE_WANDER_AROUND] = 1,
1, // MOVEMENT_TYPE_WANDER_UP_AND_DOWN [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = 1,
1, // MOVEMENT_TYPE_WANDER_DOWN_AND_UP [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = 1,
1, // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = 1,
1, // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = 1,
0, // MOVEMENT_TYPE_FACE_UP [MOVEMENT_TYPE_FACE_UP] = 0,
0, // MOVEMENT_TYPE_FACE_DOWN [MOVEMENT_TYPE_FACE_DOWN] = 0,
0, // MOVEMENT_TYPE_FACE_LEFT [MOVEMENT_TYPE_FACE_LEFT] = 0,
0, // MOVEMENT_TYPE_FACE_RIGHT [MOVEMENT_TYPE_FACE_RIGHT] = 0,
0, // MOVEMENT_TYPE_PLAYER [MOVEMENT_TYPE_PLAYER] = 0,
0, // MOVEMENT_TYPE_BERRY_TREE_GROWTH [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = 0,
0, // MOVEMENT_TYPE_FACE_DOWN_AND_UP [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = 0,
0, // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = 0,
0, // MOVEMENT_TYPE_FACE_UP_AND_LEFT [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = 0,
0, // MOVEMENT_TYPE_FACE_UP_AND_RIGHT [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = 0,
0, // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = 0,
0, // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = 0,
0, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = 0,
0, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = 0,
0, // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = 0,
0, // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = 0,
0, // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = 0,
0, // MOVEMENT_TYPE_ROTATE_CLOCKWISE [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = 0,
1, // MOVEMENT_TYPE_WALK_UP_AND_DOWN [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = 1,
1, // MOVEMENT_TYPE_WALK_DOWN_AND_UP [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = 1,
1, // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = 1,
1, // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT [MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN] = 1,
1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP] = 1,
1, // MOVEMENT_TYPE_COPY_PLAYER [MOVEMENT_TYPE_COPY_PLAYER] = 1,
1, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = 1,
1, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = 1,
1, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = 1,
0, // MOVEMENT_TYPE_TREE_DISGUISE [MOVEMENT_TYPE_TREE_DISGUISE] = 0,
0, // MOVEMENT_TYPE_MOUNTAIN_DISGUISE [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = 0,
1, // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = 1,
1, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = 1,
1, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = 1,
1, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = 1,
0, // MOVEMENT_TYPE_HIDDEN [MOVEMENT_TYPE_HIDDEN] = 0,
0, // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN [MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = 0,
0, // MOVEMENT_TYPE_WALK_IN_PLACE_UP [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = 0,
0, // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = 0,
0, // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = 0,
0, // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = 0,
0, // MOVEMENT_TYPE_JOG_IN_PLACE_UP [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = 0,
0, // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = 0,
0, // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = 0,
0, // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN [MOVEMENT_TYPE_RUN_IN_PLACE_DOWN] = 0,
0, // MOVEMENT_TYPE_RUN_IN_PLACE_UP [MOVEMENT_TYPE_RUN_IN_PLACE_UP] = 0,
0, // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT [MOVEMENT_TYPE_RUN_IN_PLACE_LEFT] = 0,
0, // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT [MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT] = 0,
0, // MOVEMENT_TYPE_INVISIBLE [MOVEMENT_TYPE_INVISIBLE] = 0,
0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN] = 0,
0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP] = 0,
0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT] = 0,
0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT] = 0,
}; };
const u8 gInitialMovementTypeFacingDirections[] = { const u8 gInitialMovementTypeFacingDirections[] = {
DIR_SOUTH, // MOVEMENT_TYPE_NONE [MOVEMENT_TYPE_NONE] = DIR_SOUTH,
DIR_SOUTH, // MOVEMENT_TYPE_LOOK_AROUND [MOVEMENT_TYPE_LOOK_AROUND] = DIR_SOUTH,
DIR_SOUTH, // MOVEMENT_TYPE_WANDER_AROUND [MOVEMENT_TYPE_WANDER_AROUND] = DIR_SOUTH,
DIR_NORTH, // MOVEMENT_TYPE_WANDER_UP_AND_DOWN [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = DIR_NORTH,
DIR_SOUTH, // MOVEMENT_TYPE_WANDER_DOWN_AND_UP [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = DIR_SOUTH,
DIR_WEST, // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = DIR_WEST,
DIR_EAST, // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = DIR_EAST,
DIR_NORTH, // MOVEMENT_TYPE_FACE_UP [MOVEMENT_TYPE_FACE_UP] = DIR_NORTH,
DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN [MOVEMENT_TYPE_FACE_DOWN] = DIR_SOUTH,
DIR_WEST, // MOVEMENT_TYPE_FACE_LEFT [MOVEMENT_TYPE_FACE_LEFT] = DIR_WEST,
DIR_EAST, // MOVEMENT_TYPE_FACE_RIGHT [MOVEMENT_TYPE_FACE_RIGHT] = DIR_EAST,
DIR_SOUTH, // MOVEMENT_TYPE_PLAYER [MOVEMENT_TYPE_PLAYER] = DIR_SOUTH,
DIR_SOUTH, // MOVEMENT_TYPE_BERRY_TREE_GROWTH [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = DIR_SOUTH,
DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_UP [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = DIR_SOUTH,
DIR_WEST, // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = DIR_WEST,
DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_AND_LEFT [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = DIR_NORTH,
DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_AND_RIGHT [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = DIR_NORTH,
DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = DIR_SOUTH,
DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = DIR_SOUTH,
DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = DIR_SOUTH,
DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = DIR_SOUTH,
DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = DIR_NORTH,
DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = DIR_SOUTH,
DIR_SOUTH, // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = DIR_SOUTH,
DIR_SOUTH, // MOVEMENT_TYPE_ROTATE_CLOCKWISE [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = DIR_SOUTH,
DIR_NORTH, // MOVEMENT_TYPE_WALK_UP_AND_DOWN [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = DIR_NORTH,
DIR_SOUTH, // MOVEMENT_TYPE_WALK_DOWN_AND_UP [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = DIR_SOUTH,
DIR_WEST, // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = DIR_WEST,
DIR_EAST, // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT [MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT] = DIR_EAST,
DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN] = DIR_NORTH,
DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP] = DIR_EAST,
DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT] = DIR_SOUTH,
DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT] = DIR_WEST,
DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN] = DIR_NORTH,
DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP] = DIR_WEST,
DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT] = DIR_SOUTH,
DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT] = DIR_EAST,
DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT] = DIR_WEST,
DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT] = DIR_NORTH,
DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN] = DIR_EAST,
DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP] = DIR_SOUTH,
DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT] = DIR_EAST,
DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT] = DIR_NORTH,
DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN] = DIR_WEST,
DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP] = DIR_SOUTH,
DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT] = DIR_NORTH,
DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT] = DIR_SOUTH,
DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP] = DIR_WEST,
DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN] = DIR_EAST,
DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT] = DIR_NORTH,
DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT] = DIR_SOUTH,
DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN] = DIR_WEST,
DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP] = DIR_EAST,
DIR_NORTH, // MOVEMENT_TYPE_COPY_PLAYER [MOVEMENT_TYPE_COPY_PLAYER] = DIR_NORTH,
DIR_SOUTH, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = DIR_SOUTH,
DIR_WEST, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = DIR_WEST,
DIR_EAST, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = DIR_EAST,
DIR_SOUTH, // MOVEMENT_TYPE_TREE_DISGUISE [MOVEMENT_TYPE_TREE_DISGUISE] = DIR_SOUTH,
DIR_SOUTH, // MOVEMENT_TYPE_MOUNTAIN_DISGUISE [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = DIR_SOUTH,
DIR_NORTH, // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = DIR_NORTH,
DIR_SOUTH, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = DIR_SOUTH,
DIR_WEST, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = DIR_WEST,
DIR_EAST, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = DIR_EAST,
DIR_SOUTH, // MOVEMENT_TYPE_HIDDEN [MOVEMENT_TYPE_HIDDEN] = DIR_SOUTH,
DIR_SOUTH, // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN [MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = DIR_SOUTH,
DIR_NORTH, // MOVEMENT_TYPE_WALK_IN_PLACE_UP [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = DIR_NORTH,
DIR_WEST, // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = DIR_WEST,
DIR_EAST, // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = DIR_EAST,
DIR_SOUTH, // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = DIR_SOUTH,
DIR_NORTH, // MOVEMENT_TYPE_JOG_IN_PLACE_UP [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = DIR_NORTH,
DIR_WEST, // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = DIR_WEST,
DIR_EAST, // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = DIR_EAST,
DIR_SOUTH, // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN [MOVEMENT_TYPE_RUN_IN_PLACE_DOWN] = DIR_SOUTH,
DIR_NORTH, // MOVEMENT_TYPE_RUN_IN_PLACE_UP [MOVEMENT_TYPE_RUN_IN_PLACE_UP] = DIR_NORTH,
DIR_WEST, // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT [MOVEMENT_TYPE_RUN_IN_PLACE_LEFT] = DIR_WEST,
DIR_EAST, // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT [MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT] = DIR_EAST,
DIR_SOUTH, // MOVEMENT_TYPE_INVISIBLE [MOVEMENT_TYPE_INVISIBLE] = DIR_SOUTH,
DIR_SOUTH, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN] = DIR_SOUTH,
DIR_NORTH, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP] = DIR_NORTH,
DIR_WEST, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT] = DIR_WEST,
DIR_EAST, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT] = DIR_EAST,
}; };
#define EVENT_OBJ_PAL_TAG_0 0x1103 #define EVENT_OBJ_PAL_TAG_0 0x1103
@ -668,181 +668,181 @@ const s16 gMovementDelaysShort[] = {32, 48, 64, 80};
#include "data/field_event_obj/movement_type_func_tables.h" #include "data/field_event_obj/movement_type_func_tables.h"
const u8 gFaceDirectionAnimNums[] = { const u8 gFaceDirectionAnimNums[] = {
0, // DIR_NONE [DIR_NONE] = 0,
0, // DIR_SOUTH [DIR_SOUTH] = 0,
1, // DIR_NORTH [DIR_NORTH] = 1,
2, // DIR_WEST [DIR_WEST] = 2,
3, // DIR_EAST [DIR_EAST] = 3,
0, // DIR_SOUTHWEST [DIR_SOUTHWEST] = 0,
0, // DIR_SOUTHEAST [DIR_SOUTHEAST] = 0,
1, // DIR_NORTHWEST [DIR_NORTHWEST] = 1,
1, // DIR_NORTHEAST [DIR_NORTHEAST] = 1,
}; };
const u8 gMoveDirectionAnimNums[] = { const u8 gMoveDirectionAnimNums[] = {
4, // DIR_NONE [DIR_NONE] = 4,
4, // DIR_SOUTH [DIR_SOUTH] = 4,
5, // DIR_NORTH [DIR_NORTH] = 5,
6, // DIR_WEST [DIR_WEST] = 6,
7, // DIR_EAST [DIR_EAST] = 7,
4, // DIR_SOUTHWEST [DIR_SOUTHWEST] = 4,
4, // DIR_SOUTHEAST [DIR_SOUTHEAST] = 4,
5, // DIR_NORTHWEST [DIR_NORTHWEST] = 5,
5, // DIR_NORTHEAST [DIR_NORTHEAST] = 5,
}; };
const u8 gMoveDirectionFastAnimNums[] = { const u8 gMoveDirectionFastAnimNums[] = {
8, // DIR_NONE [DIR_NONE] = 8,
8, // DIR_SOUTH [DIR_SOUTH] = 8,
9, // DIR_NORTH [DIR_NORTH] = 9,
10, // DIR_WEST [DIR_WEST] = 10,
11, // DIR_EAST [DIR_EAST] = 11,
8, // DIR_SOUTHWEST [DIR_SOUTHWEST] = 8,
8, // DIR_SOUTHEAST [DIR_SOUTHEAST] = 8,
9, // DIR_NORTHWEST [DIR_NORTHWEST] = 9,
9, // DIR_NORTHEAST [DIR_NORTHEAST] = 9,
}; };
const u8 gMoveDirectionFasterAnimNums[] = { const u8 gMoveDirectionFasterAnimNums[] = {
12, // DIR_NONE [DIR_NONE] = 12,
12, // DIR_SOUTH [DIR_SOUTH] = 12,
13, // DIR_NORTH [DIR_NORTH] = 13,
14, // DIR_WEST [DIR_WEST] = 14,
15, // DIR_EAST [DIR_EAST] = 15,
12, // DIR_SOUTHWEST [DIR_SOUTHWEST] = 12,
12, // DIR_SOUTHEAST [DIR_SOUTHEAST] = 12,
13, // DIR_NORTHWEST [DIR_NORTHWEST] = 13,
13, // DIR_NORTHEAST [DIR_NORTHEAST] = 13,
}; };
const u8 gMoveDirectionFastestAnimNums[] = { const u8 gMoveDirectionFastestAnimNums[] = {
16, // DIR_NONE [DIR_NONE] = 16,
16, // DIR_SOUTH [DIR_SOUTH] = 16,
17, // DIR_NORTH [DIR_NORTH] = 17,
18, // DIR_WEST [DIR_WEST] = 18,
19, // DIR_EAST [DIR_EAST] = 19,
16, // DIR_SOUTHWEST [DIR_SOUTHWEST] = 16,
16, // DIR_SOUTHEAST [DIR_SOUTHEAST] = 16,
17, // DIR_NORTHWEST [DIR_NORTHWEST] = 17,
17, // DIR_NORTHEAST [DIR_NORTHEAST] = 17,
}; };
const u8 gJumpSpecialDirectionAnimNums[] = { // used for jumping onto surf mon const u8 gJumpSpecialDirectionAnimNums[] = { // used for jumping onto surf mon
20, // DIR_NONE [DIR_NONE] = 20,
20, // DIR_SOUTH [DIR_SOUTH] = 20,
21, // DIR_NORTH [DIR_NORTH] = 21,
22, // DIR_WEST [DIR_WEST] = 22,
23, // DIR_EAST [DIR_EAST] = 23,
20, // DIR_SOUTHWEST [DIR_SOUTHWEST] = 20,
20, // DIR_SOUTHEAST [DIR_SOUTHEAST] = 20,
21, // DIR_NORTHWEST [DIR_NORTHWEST] = 21,
21, // DIR_NORTHEAST [DIR_NORTHEAST] = 21,
}; };
const u8 gAcroWheelieDirectionAnimNums[] = { const u8 gAcroWheelieDirectionAnimNums[] = {
20, // DIR_NONE [DIR_NONE] = 20,
20, // DIR_SOUTH [DIR_SOUTH] = 20,
21, // DIR_NORTH [DIR_NORTH] = 21,
22, // DIR_WEST [DIR_WEST] = 22,
23, // DIR_EAST [DIR_EAST] = 23,
20, // DIR_SOUTHWEST [DIR_SOUTHWEST] = 20,
20, // DIR_SOUTHEAST [DIR_SOUTHEAST] = 20,
21, // DIR_NORTHWEST [DIR_NORTHWEST] = 21,
21, // DIR_NORTHEAST [DIR_NORTHEAST] = 21,
}; };
const u8 gUnrefAnimNums_08375633[] = { const u8 gUnrefAnimNums_08375633[] = {
24, // DIR_NONE [DIR_NONE] = 24,
24, // DIR_SOUTH [DIR_SOUTH] = 24,
25, // DIR_NORTH [DIR_NORTH] = 25,
26, // DIR_WEST [DIR_WEST] = 26,
27, // DIR_EAST [DIR_EAST] = 27,
24, // DIR_SOUTHWEST [DIR_SOUTHWEST] = 24,
24, // DIR_SOUTHEAST [DIR_SOUTHEAST] = 24,
25, // DIR_NORTHWEST [DIR_NORTHWEST] = 25,
25, // DIR_NORTHEAST [DIR_NORTHEAST] = 25,
}; };
const u8 gAcroEndWheelieDirectionAnimNums[] = { const u8 gAcroEndWheelieDirectionAnimNums[] = {
28, // DIR_NONE [DIR_NONE] = 28,
28, // DIR_SOUTH [DIR_SOUTH] = 28,
29, // DIR_NORTH [DIR_NORTH] = 29,
30, // DIR_WEST [DIR_WEST] = 30,
31, // DIR_EAST [DIR_EAST] = 31,
28, // DIR_SOUTHWEST [DIR_SOUTHWEST] = 28,
28, // DIR_SOUTHEAST [DIR_SOUTHEAST] = 28,
29, // DIR_NORTHWEST [DIR_NORTHWEST] = 29,
29, // DIR_NORTHEAST [DIR_NORTHEAST] = 29,
}; };
const u8 gAcroUnusedActionDirectionAnimNums[] = { const u8 gAcroUnusedActionDirectionAnimNums[] = {
32, // DIR_NONE [DIR_NONE] = 32,
32, // DIR_SOUTH [DIR_SOUTH] = 32,
33, // DIR_NORTH [DIR_NORTH] = 33,
34, // DIR_WEST [DIR_WEST] = 34,
35, // DIR_EAST [DIR_EAST] = 35,
32, // DIR_SOUTHWEST [DIR_SOUTHWEST] = 32,
32, // DIR_SOUTHEAST [DIR_SOUTHEAST] = 32,
33, // DIR_NORTHWEST [DIR_NORTHWEST] = 33,
33, // DIR_NORTHEAST [DIR_NORTHEAST] = 33,
}; };
const u8 gAcroWheeliePedalDirectionAnimNums[] = { const u8 gAcroWheeliePedalDirectionAnimNums[] = {
36, // DIR_NONE [DIR_NONE] = 36,
36, // DIR_SOUTH [DIR_SOUTH] = 36,
37, // DIR_NORTH [DIR_NORTH] = 37,
38, // DIR_WEST [DIR_WEST] = 38,
39, // DIR_EAST [DIR_EAST] = 39,
36, // DIR_SOUTHWEST [DIR_SOUTHWEST] = 36,
36, // DIR_SOUTHEAST [DIR_SOUTHEAST] = 36,
37, // DIR_NORTHWEST [DIR_NORTHWEST] = 37,
37, // DIR_NORTHEAST [DIR_NORTHEAST] = 37,
}; };
const u8 gFishingDirectionAnimNums[] = { const u8 gFishingDirectionAnimNums[] = {
0, // DIR_NONE [DIR_NONE] = 0,
0, // DIR_SOUTH [DIR_SOUTH] = 0,
1, // DIR_NORTH [DIR_NORTH] = 1,
2, // DIR_WEST [DIR_WEST] = 2,
3, // DIR_EAST [DIR_EAST] = 3,
0, // DIR_SOUTHWEST [DIR_SOUTHWEST] = 0,
0, // DIR_SOUTHEAST [DIR_SOUTHEAST] = 0,
1, // DIR_NORTHWEST [DIR_NORTHWEST] = 1,
1, // DIR_NORTHEAST [DIR_NORTHEAST] = 1,
}; };
const u8 gFishingNoCatchDirectionAnimNums[] = { const u8 gFishingNoCatchDirectionAnimNums[] = {
4, // DIR_NONE [DIR_NONE] = 4,
4, // DIR_SOUTH [DIR_SOUTH] = 4,
5, // DIR_NORTH [DIR_NORTH] = 5,
6, // DIR_WEST [DIR_WEST] = 6,
7, // DIR_EAST [DIR_EAST] = 7,
4, // DIR_SOUTHWEST [DIR_SOUTHWEST] = 4,
4, // DIR_SOUTHEAST [DIR_SOUTHEAST] = 4,
5, // DIR_NORTHWEST [DIR_NORTHWEST] = 5,
5, // DIR_NORTHEAST [DIR_NORTHEAST] = 5,
}; };
const u8 gFishingBiteDirectionAnimNums[] = { const u8 gFishingBiteDirectionAnimNums[] = {
8, // DIR_NONE [DIR_NONE] = 8,
8, // DIR_SOUTH [DIR_SOUTH] = 8,
9, // DIR_NORTH [DIR_NORTH] = 9,
10, // DIR_WEST [DIR_WEST] = 10,
11, // DIR_EAST [DIR_EAST] = 11,
8, // DIR_SOUTHWEST [DIR_SOUTHWEST] = 8,
8, // DIR_SOUTHEAST [DIR_SOUTHEAST] = 8,
9, // DIR_NORTHWEST [DIR_NORTHWEST] = 9,
9, // DIR_NORTHEAST [DIR_NORTHEAST] = 9,
}; };
const u8 gRunningDirectionAnimNums[] = { const u8 gRunningDirectionAnimNums[] = {
20, // DIR_NONE [DIR_NONE] = 20,
20, // DIR_SOUTH [DIR_SOUTH] = 20,
21, // DIR_NORTH [DIR_NORTH] = 21,
22, // DIR_WEST [DIR_WEST] = 22,
23, // DIR_EAST [DIR_EAST] = 23,
20, // DIR_SOUTHWEST [DIR_SOUTHWEST] = 20,
20, // DIR_SOUTHEAST [DIR_SOUTHEAST] = 20,
21, // DIR_NORTHWEST [DIR_NORTHWEST] = 21,
21, // DIR_NORTHEAST [DIR_NORTHEAST] = 21,
}; };
const u8 gTrainerFacingDirectionMovementTypes[] = { const u8 gTrainerFacingDirectionMovementTypes[] = {
MOVEMENT_TYPE_FACE_DOWN, // DIR_NONE [DIR_NONE] = MOVEMENT_TYPE_FACE_DOWN,
MOVEMENT_TYPE_FACE_DOWN, // DIR_SOUTH [DIR_SOUTH] = MOVEMENT_TYPE_FACE_DOWN,
MOVEMENT_TYPE_FACE_UP, // DIR_NORTH [DIR_NORTH] = MOVEMENT_TYPE_FACE_UP,
MOVEMENT_TYPE_FACE_LEFT, // DIR_WEST [DIR_WEST] = MOVEMENT_TYPE_FACE_LEFT,
MOVEMENT_TYPE_FACE_RIGHT, // DIR_EAST [DIR_EAST] = MOVEMENT_TYPE_FACE_RIGHT,
MOVEMENT_TYPE_FACE_DOWN, // DIR_SOUTHWEST [DIR_SOUTHWEST] = MOVEMENT_TYPE_FACE_DOWN,
MOVEMENT_TYPE_FACE_DOWN, // DIR_SOUTHEAST [DIR_SOUTHEAST] = MOVEMENT_TYPE_FACE_DOWN,
MOVEMENT_TYPE_FACE_UP, // DIR_NORTHWEST [DIR_NORTHWEST] = MOVEMENT_TYPE_FACE_UP,
MOVEMENT_TYPE_FACE_UP, // DIR_NORTHEAST [DIR_NORTHEAST] = MOVEMENT_TYPE_FACE_UP,
}; };
bool8 (*const gOppositeDirectionBlockedMetatileFuncs[])(u8) = { bool8 (*const gOppositeDirectionBlockedMetatileFuncs[])(u8) = {

2
src/evolution_scene.c
View File

@ -2,7 +2,7 @@
#include "evolution_scene.h" #include "evolution_scene.h"
#include "evolution_graphics.h" #include "evolution_graphics.h"
#include "sprite.h" #include "sprite.h"
#include "malloc.h" #include "alloc.h"
#include "task.h" #include "task.h"
#include "palette.h" #include "palette.h"
#include "main.h" #include "main.h"

12
src/field_effect.c
View File

@ -305,7 +305,7 @@ const union AnimCmd *const gNewGameBirchImageAnimTable[] = {
}; };
const struct SpriteTemplate gNewGameBirchObjectTemplate = { const struct SpriteTemplate gNewGameBirchObjectTemplate = {
.tileTag = 0xffff, .tileTag = 0xFFFF,
.paletteTag = 4102, .paletteTag = 4102,
.oam = &gNewGameBirchOamAttributes, .oam = &gNewGameBirchOamAttributes,
.anims = gNewGameBirchImageAnimTable, .anims = gNewGameBirchImageAnimTable,
@ -383,7 +383,7 @@ const union AnimCmd *const gSpriteAnimTable_855C300[] = {
}; };
const struct SpriteTemplate gSpriteTemplate_855C304 = { const struct SpriteTemplate gSpriteTemplate_855C304 = {
.tileTag = 0xffff, .tileTag = 0xFFFF,
.paletteTag = 4103, .paletteTag = 4103,
.oam = &gOamData_855C218, .oam = &gOamData_855C218,
.anims = gSpriteAnimTable_855C2F8, .anims = gSpriteAnimTable_855C2F8,
@ -393,7 +393,7 @@ const struct SpriteTemplate gSpriteTemplate_855C304 = {
}; };
const struct SpriteTemplate gSpriteTemplate_855C31C = { const struct SpriteTemplate gSpriteTemplate_855C31C = {
.tileTag = 0xffff, .tileTag = 0xFFFF,
.paletteTag = 4100, .paletteTag = 4100,
.oam = &gOamData_855C220, .oam = &gOamData_855C220,
.anims = gSpriteAnimTable_855C2F8, .anims = gSpriteAnimTable_855C2F8,
@ -403,7 +403,7 @@ const struct SpriteTemplate gSpriteTemplate_855C31C = {
}; };
const struct SpriteTemplate gSpriteTemplate_855C334 = { const struct SpriteTemplate gSpriteTemplate_855C334 = {
.tileTag = 0xffff, .tileTag = 0xFFFF,
.paletteTag = 4112, .paletteTag = 4112,
.oam = &gOamData_855C220, .oam = &gOamData_855C220,
.anims = gSpriteAnimTable_855C300, .anims = gSpriteAnimTable_855C300,
@ -413,7 +413,7 @@ const struct SpriteTemplate gSpriteTemplate_855C334 = {
}; };
const struct SpriteTemplate gSpriteTemplate_855C34C = { const struct SpriteTemplate gSpriteTemplate_855C34C = {
.tileTag = 0xffff, .tileTag = 0xFFFF,
.paletteTag = 4112, .paletteTag = 4112,
.oam = &gOamData_855C26C, .oam = &gOamData_855C26C,
.anims = gSpriteAnimTable_855C300, .anims = gSpriteAnimTable_855C300,
@ -3591,7 +3591,7 @@ const union AnimCmd *const gSpriteAnimTable_855C5DC[] = {
}; };
const struct SpriteTemplate gUnknown_0855C5EC = { const struct SpriteTemplate gUnknown_0855C5EC = {
.tileTag = 0xffff, .tileTag = 0xFFFF,
.paletteTag = 4378, .paletteTag = 4378,
.oam = &gOamData_855C218, .oam = &gOamData_855C218,
.anims = gSpriteAnimTable_855C5DC, .anims = gSpriteAnimTable_855C5DC,

18
src/field_effect_helpers.c
View File

@ -1007,15 +1007,15 @@ void UpdateSurfBlobFieldEffect(struct Sprite *sprite)
static void SynchroniseSurfAnim(struct EventObject *eventObject, struct Sprite *sprite) static void SynchroniseSurfAnim(struct EventObject *eventObject, struct Sprite *sprite)
{ {
u8 surfBlobDirectionAnims[] = { u8 surfBlobDirectionAnims[] = {
0, // DIR_NONE [DIR_NONE] = 0,
0, // DIR_SOUTH [DIR_SOUTH] = 0,
1, // DIR_NORTH [DIR_NORTH] = 1,
2, // DIR_WEST [DIR_WEST] = 2,
3, // DIR_EAST [DIR_EAST] = 3,
0, [DIR_SOUTHWEST] = 0,
0, [DIR_SOUTHEAST] = 0,
1, [DIR_NORTHWEST] = 1,
1, [DIR_NORTHEAST] = 1,
}; };
if (sub_8155640(sprite) == 0) if (sub_8155640(sprite) == 0)

2
src/field_region_map.c
View File

@ -3,7 +3,7 @@
#include "gpu_regs.h" #include "gpu_regs.h"
#include "international_string_util.h" #include "international_string_util.h"
#include "main.h" #include "main.h"
#include "malloc.h" #include "alloc.h"
#include "menu.h" #include "menu.h"
#include "palette.h" #include "palette.h"
#include "region_map.h" #include "region_map.h"

46
src/field_specials.c
View File

@ -20,7 +20,7 @@
#include "link.h" #include "link.h"
#include "list_menu.h" #include "list_menu.h"
#include "main.h" #include "main.h"
#include "malloc.h" #include "alloc.h"
#include "match_call.h" #include "match_call.h"
#include "menu.h" #include "menu.h"
#include "overworld.h" #include "overworld.h"
@ -1691,22 +1691,22 @@ const struct WindowTemplate gUnknown_085B2BAC = {
}; };
const u8 *const gElevatorFloorsTable[] = { const u8 *const gElevatorFloorsTable[] = {
gText_B4F, gText_B4F,
gText_B3F, gText_B3F,
gText_B2F, gText_B2F,
gText_B1F, gText_B1F,
gText_1F, gText_1F,
gText_2F, gText_2F,
gText_3F, gText_3F,
gText_4F, gText_4F,
gText_5F, gText_5F,
gText_6F, gText_6F,
gText_7F, gText_7F,
gText_8F, gText_8F,
gText_9F, gText_9F,
gText_10F, gText_10F,
gText_11F, gText_11F,
gText_Rooftop gText_Rooftop
}; };
const u16 gUnknown_085B2BF4[][3] = const u16 gUnknown_085B2BF4[][3] =
@ -1957,7 +1957,7 @@ void sub_8139D98(void)
bool32 warp0_in_pokecenter(void) bool32 warp0_in_pokecenter(void)
{ {
static const u16 gUnknown_085B2C2A[] = { 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a, 0x1a35, 0x193c, 0xffff }; static const u16 gUnknown_085B2C2A[] = { 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a, 0x1a35, 0x193c, 0xFFFF };
int i; int i;
u16 map = (gLastUsedWarp.mapGroup << 8) + gLastUsedWarp.mapNum; u16 map = (gLastUsedWarp.mapGroup << 8) + gLastUsedWarp.mapNum;
@ -2946,10 +2946,10 @@ void sub_813AA44(void)
static void sub_813AA60(u16 a0, u16 a1) static void sub_813AA60(u16 a0, u16 a1)
{ {
static const u16 gUnknown_085B312C[] = { 0x004b, 0x0067, 0x0057, 0x004f, 0x0054, 0x0055, 0x0056, 0x0050, 0x0051, 0x0052, 0xffff }; static const u16 gUnknown_085B312C[] = { 0x004b, 0x0067, 0x0057, 0x004f, 0x0054, 0x0055, 0x0056, 0x0050, 0x0051, 0x0052, 0xFFFF };
static const u16 gUnknown_085B3142[] = { 0x0071, 0x006f, 0x0072, 0x0073, 0x0074, 0xffff }; static const u16 gUnknown_085B3142[] = { 0x0071, 0x006f, 0x0072, 0x0073, 0x0074, 0xFFFF };
static const u16 gUnknown_085B314E[] = { 0x0040, 0x0043, 0x0041, 0x0046, 0x0042, 0x003f, 0xffff }; static const u16 gUnknown_085B314E[] = { 0x0040, 0x0043, 0x0041, 0x0046, 0x0042, 0x003f, 0xFFFF };
static const u16 gUnknown_085B315C[] = { 0x00c8, 0x00b4, 0x00b7, 0x00b9, 0x00b3, 0x00ba, 0x00bb, 0x00c4, 0x00c6, 0xffff }; static const u16 gUnknown_085B315C[] = { 0x00c8, 0x00b4, 0x00b7, 0x00b9, 0x00b3, 0x00ba, 0x00bb, 0x00c4, 0x00c6, 0xFFFF };
static const u8 *const gUnknown_085B3170[] = { static const u8 *const gUnknown_085B3170[] = {
BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA, BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA,
@ -3841,7 +3841,7 @@ bool32 sub_813B9C0(void)
MAP_TRADE_CENTER, MAP_TRADE_CENTER,
MAP_RECORD_CORNER, MAP_RECORD_CORNER,
MAP_DOUBLE_BATTLE_COLOSSEUM, MAP_DOUBLE_BATTLE_COLOSSEUM,
0xffff 0xFFFF
}; };
int i; int i;

2
src/fieldmap.c
View File

@ -496,7 +496,7 @@ u16 GetBehaviorByMetatileId(u16 metatile)
} }
else else
{ {
return 0xff; return 0xFF;
} }
} }

2
src/fldeff_cut.c
View File

@ -6,7 +6,7 @@
#include "field_player_avatar.h" #include "field_player_avatar.h"
#include "fieldmap.h" #include "fieldmap.h"
#include "fldeff_cut.h" #include "fldeff_cut.h"
#include "malloc.h" #include "alloc.h"
#include "metatile_behavior.h" #include "metatile_behavior.h"
#include "overworld.h" #include "overworld.h"
#include "party_menu.h" #include "party_menu.h"

2
src/fldeff_groundshake.c
View File

@ -2,7 +2,7 @@
#include "event_data.h" #include "event_data.h"
#include "event_object_movement.h" #include "event_object_movement.h"
#include "field_camera.h" #include "field_camera.h"
#include "malloc.h" #include "alloc.h"
#include "random.h" #include "random.h"
#include "roulette_util.h" #include "roulette_util.h"
#include "script.h" #include "script.h"

198
src/fossil_specials.c
View File

@ -8,7 +8,7 @@
#include "fieldmap.h" #include "fieldmap.h"
#include "global.fieldmap.h" #include "global.fieldmap.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "malloc.h" #include "alloc.h"
#include "menu.h" #include "menu.h"
#include "random.h" #include "random.h"
#include "script.h" #include "script.h"
@ -458,104 +458,104 @@ static void sub_81BF2B8(u8* a, u16 b, u8 c, u8 d, u8 e)
{ {
asm_unified("\n\ asm_unified("\n\
push {r4-r7,lr}\n\ push {r4-r7,lr}\n\
mov r7, r10\n\ mov r7, r10\n\
mov r6, r9\n\ mov r6, r9\n\
mov r5, r8\n\ mov r5, r8\n\
push {r5-r7}\n\ push {r5-r7}\n\
sub sp, 0x8\n\ sub sp, 0x8\n\
str r0, [sp]\n\ str r0, [sp]\n\
mov r10, r1\n\ mov r10, r1\n\
adds r6, r2, 0\n\ adds r6, r2, 0\n\
mov r8, r3\n\ mov r8, r3\n\
ldr r0, [sp, 0x28]\n\ ldr r0, [sp, 0x28]\n\
mov r9, r0\n\ mov r9, r0\n\
lsls r1, 16\n\ lsls r1, 16\n\
lsrs r1, 16\n\ lsrs r1, 16\n\
mov r10, r1\n\ mov r10, r1\n\
lsls r6, 24\n\ lsls r6, 24\n\
lsrs r6, 24\n\ lsrs r6, 24\n\
mov r0, r8\n\ mov r0, r8\n\
lsls r0, 24\n\ lsls r0, 24\n\
mov r8, r0\n\ mov r8, r0\n\
lsrs r7, r0, 24\n\ lsrs r7, r0, 24\n\
mov r1, r9\n\ mov r1, r9\n\
lsls r1, 24\n\ lsls r1, 24\n\
lsrs r1, 24\n\ lsrs r1, 24\n\
mov r9, r1\n\ mov r9, r1\n\
mov r0, r10\n\ mov r0, r10\n\
adds r1, r7, 0\n\ adds r1, r7, 0\n\
bl __divsi3\n\ bl __divsi3\n\
adds r5, r0, 0\n\ adds r5, r0, 0\n\
lsls r5, 24\n\ lsls r5, 24\n\
lsrs r4, r5, 24\n\ lsrs r4, r5, 24\n\
ldr r3, =gUnknown_030012A8\n\ ldr r3, =gUnknown_030012A8\n\
strh r4, [r3]\n\ strh r4, [r3]\n\
mov r0, r10\n\ mov r0, r10\n\
adds r1, r7, 0\n\ adds r1, r7, 0\n\
str r3, [sp, 0x4]\n\ str r3, [sp, 0x4]\n\
bl __modsi3\n\ bl __modsi3\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r2, r0, 24\n\ lsrs r2, r0, 24\n\
ldr r3, [sp, 0x4]\n\ ldr r3, [sp, 0x4]\n\
strh r2, [r3, 0x2]\n\ strh r2, [r3, 0x2]\n\
movs r1, 0x7\n\ movs r1, 0x7\n\
ands r4, r1\n\ ands r4, r1\n\
ands r2, r1\n\ ands r2, r1\n\
strh r4, [r3, 0x4]\n\ strh r4, [r3, 0x4]\n\
strh r2, [r3, 0x6]\n\ strh r2, [r3, 0x6]\n\
lsrs r0, 27\n\ lsrs r0, 27\n\
lsrs r5, 27\n\ lsrs r5, 27\n\
strh r0, [r3, 0x8]\n\ strh r0, [r3, 0x8]\n\
strh r5, [r3, 0xA]\n\ strh r5, [r3, 0xA]\n\
mov r1, r8\n\ mov r1, r8\n\
lsrs r1, 27\n\ lsrs r1, 27\n\
lsls r1, 6\n\ lsls r1, 6\n\
mov r8, r1\n\ mov r8, r1\n\
mov r1, r8\n\ mov r1, r8\n\
muls r1, r5\n\ muls r1, r5\n\
lsls r0, 6\n\ lsls r0, 6\n\
adds r1, r0\n\ adds r1, r0\n\
lsls r1, 16\n\ lsls r1, 16\n\
lsrs r1, 16\n\ lsrs r1, 16\n\
strh r1, [r3, 0xC]\n\ strh r1, [r3, 0xC]\n\
lsls r4, 3\n\ lsls r4, 3\n\
adds r4, r2\n\ adds r4, r2\n\
adds r1, r4\n\ adds r1, r4\n\
lsls r4, r1, 16\n\ lsls r4, r1, 16\n\
lsrs r4, 17\n\ lsrs r4, 17\n\
strh r1, [r3, 0xE]\n\ strh r1, [r3, 0xE]\n\
movs r1, 0x1\n\ movs r1, 0x1\n\
mov r0, r10\n\ mov r0, r10\n\
ands r1, r0\n\ ands r1, r0\n\
movs r2, 0x1\n\ movs r2, 0x1\n\
eors r1, r2\n\ eors r1, r2\n\
lsls r0, r1, 2\n\ lsls r0, r1, 2\n\
lsls r6, r0\n\ lsls r6, r0\n\
eors r1, r2\n\ eors r1, r2\n\
lsls r1, 2\n\ lsls r1, 2\n\
movs r0, 0xF\n\ movs r0, 0xF\n\
lsls r0, r1\n\ lsls r0, r1\n\
orrs r6, r0\n\ orrs r6, r0\n\
lsls r6, 24\n\ lsls r6, 24\n\
lsrs r6, 24\n\ lsrs r6, 24\n\
mov r1, r9\n\ mov r1, r9\n\
lsls r1, 5\n\ lsls r1, 5\n\
mov r9, r1\n\ mov r9, r1\n\
add r9, r4\n\ add r9, r4\n\
ldr r1, [sp]\n\ ldr r1, [sp]\n\
add r1, r9\n\ add r1, r9\n\
ldrb r0, [r1]\n\ ldrb r0, [r1]\n\
ands r6, r0\n\ ands r6, r0\n\
strb r6, [r1]\n\ strb r6, [r1]\n\
add sp, 0x8\n\ add sp, 0x8\n\
pop {r3-r5}\n\ pop {r3-r5}\n\
mov r8, r3\n\ mov r8, r3\n\
mov r9, r4\n\ mov r9, r4\n\
mov r10, r5\n\ mov r10, r5\n\
pop {r4-r7}\n\ pop {r4-r7}\n\
pop {r0}\n\ pop {r0}\n\
bx r0\n\ bx r0\n\
.pool\n\ .pool\n\
"); ");
} }
#endif // NONMATCHING #endif // NONMATCHING

2
src/frontier_util.c
View File

@ -24,7 +24,7 @@
#include "data2.h" #include "data2.h"
#include "record_mixing.h" #include "record_mixing.h"
#include "strings.h" #include "strings.h"
#include "malloc.h" #include "alloc.h"
#include "save.h" #include "save.h"
#include "load_save.h" #include "load_save.h"
#include "battle_dome.h" #include "battle_dome.h"

192
src/gpu_regs.c
View File

@ -20,166 +20,166 @@ static void UpdateRegDispstatIntrBits(u16 regIE);
void InitGpuRegManager(void) void InitGpuRegManager(void)
{ {
s32 i; s32 i;
for (i = 0; i < GPU_REG_BUF_SIZE; i++) for (i = 0; i < GPU_REG_BUF_SIZE; i++)
{ {
sGpuRegBuffer[i] = 0; sGpuRegBuffer[i] = 0;
sGpuRegWaitingList[i] = EMPTY_SLOT; sGpuRegWaitingList[i] = EMPTY_SLOT;
} }
sGpuRegBufferLocked = FALSE; sGpuRegBufferLocked = FALSE;
sShouldSyncRegIE = FALSE; sShouldSyncRegIE = FALSE;
sRegIE = 0; sRegIE = 0;
} }
static void CopyBufferedValueToGpuReg(u8 regOffset) static void CopyBufferedValueToGpuReg(u8 regOffset)
{ {
if (regOffset == REG_OFFSET_DISPSTAT) if (regOffset == REG_OFFSET_DISPSTAT)
{ {
REG_DISPSTAT &= ~(DISPSTAT_HBLANK_INTR | DISPSTAT_VBLANK_INTR); REG_DISPSTAT &= ~(DISPSTAT_HBLANK_INTR | DISPSTAT_VBLANK_INTR);
REG_DISPSTAT |= GPU_REG_BUF(REG_OFFSET_DISPSTAT); REG_DISPSTAT |= GPU_REG_BUF(REG_OFFSET_DISPSTAT);
} }
else else
{ {
GPU_REG(regOffset) = GPU_REG_BUF(regOffset); GPU_REG(regOffset) = GPU_REG_BUF(regOffset);
} }
} }
void CopyBufferedValuesToGpuRegs(void) void CopyBufferedValuesToGpuRegs(void)
{ {
if (!sGpuRegBufferLocked) if (!sGpuRegBufferLocked)
{ {
s32 i; s32 i;
for (i = 0; i < GPU_REG_BUF_SIZE; i++) for (i = 0; i < GPU_REG_BUF_SIZE; i++)
{ {
u8 regOffset = sGpuRegWaitingList[i]; u8 regOffset = sGpuRegWaitingList[i];
if (regOffset == EMPTY_SLOT) if (regOffset == EMPTY_SLOT)
return; return;
CopyBufferedValueToGpuReg(regOffset); CopyBufferedValueToGpuReg(regOffset);
sGpuRegWaitingList[i] = EMPTY_SLOT; sGpuRegWaitingList[i] = EMPTY_SLOT;
} }
} }
} }
void SetGpuReg(u8 regOffset, u16 value) void SetGpuReg(u8 regOffset, u16 value)
{ {
if (regOffset < GPU_REG_BUF_SIZE) if (regOffset < GPU_REG_BUF_SIZE)
{ {
u16 vcount; u16 vcount;
GPU_REG_BUF(regOffset) = value; GPU_REG_BUF(regOffset) = value;
vcount = REG_VCOUNT & 0xFF; vcount = REG_VCOUNT & 0xFF;
if ((vcount >= 161 && vcount <= 225) if ((vcount >= 161 && vcount <= 225)
|| (REG_DISPCNT & DISPCNT_FORCED_BLANK)) { || (REG_DISPCNT & DISPCNT_FORCED_BLANK)) {
CopyBufferedValueToGpuReg(regOffset); CopyBufferedValueToGpuReg(regOffset);
} else { } else {
s32 i; s32 i;
sGpuRegBufferLocked = TRUE; sGpuRegBufferLocked = TRUE;
for (i = 0; i < GPU_REG_BUF_SIZE && sGpuRegWaitingList[i] != EMPTY_SLOT; i++) { for (i = 0; i < GPU_REG_BUF_SIZE && sGpuRegWaitingList[i] != EMPTY_SLOT; i++) {
if (sGpuRegWaitingList[i] == regOffset) { if (sGpuRegWaitingList[i] == regOffset) {
sGpuRegBufferLocked = FALSE; sGpuRegBufferLocked = FALSE;
return; return;
} }
} }
sGpuRegWaitingList[i] = regOffset; sGpuRegWaitingList[i] = regOffset;
sGpuRegBufferLocked = FALSE; sGpuRegBufferLocked = FALSE;
} }
} }
} }
void SetGpuReg_ForcedBlank(u8 regOffset, u16 value) void SetGpuReg_ForcedBlank(u8 regOffset, u16 value)
{ {
if (regOffset < GPU_REG_BUF_SIZE) if (regOffset < GPU_REG_BUF_SIZE)
{ {
GPU_REG_BUF(regOffset) = value; GPU_REG_BUF(regOffset) = value;
if (REG_DISPCNT & DISPCNT_FORCED_BLANK) { if (REG_DISPCNT & DISPCNT_FORCED_BLANK) {
CopyBufferedValueToGpuReg(regOffset); CopyBufferedValueToGpuReg(regOffset);
} else { } else {
s32 i; s32 i;
sGpuRegBufferLocked = TRUE; sGpuRegBufferLocked = TRUE;
for (i = 0; i < GPU_REG_BUF_SIZE && sGpuRegWaitingList[i] != EMPTY_SLOT; i++) { for (i = 0; i < GPU_REG_BUF_SIZE && sGpuRegWaitingList[i] != EMPTY_SLOT; i++) {
if (sGpuRegWaitingList[i] == regOffset) { if (sGpuRegWaitingList[i] == regOffset) {
sGpuRegBufferLocked = FALSE; sGpuRegBufferLocked = FALSE;
return; return;
} }
} }
sGpuRegWaitingList[i] = regOffset; sGpuRegWaitingList[i] = regOffset;
sGpuRegBufferLocked = FALSE; sGpuRegBufferLocked = FALSE;
} }
} }
} }
u16 GetGpuReg(u8 regOffset) u16 GetGpuReg(u8 regOffset)
{ {
if (regOffset == REG_OFFSET_DISPSTAT) if (regOffset == REG_OFFSET_DISPSTAT)
return REG_DISPSTAT; return REG_DISPSTAT;
if (regOffset == REG_OFFSET_VCOUNT) if (regOffset == REG_OFFSET_VCOUNT)
return REG_VCOUNT; return REG_VCOUNT;
return GPU_REG_BUF(regOffset); return GPU_REG_BUF(regOffset);
} }
void SetGpuRegBits(u8 regOffset, u16 mask) void SetGpuRegBits(u8 regOffset, u16 mask)
{ {
u16 regValue = GPU_REG_BUF(regOffset); u16 regValue = GPU_REG_BUF(regOffset);
SetGpuReg(regOffset, regValue | mask); SetGpuReg(regOffset, regValue | mask);
} }
void ClearGpuRegBits(u8 regOffset, u16 mask) void ClearGpuRegBits(u8 regOffset, u16 mask)
{ {
u16 regValue = GPU_REG_BUF(regOffset); u16 regValue = GPU_REG_BUF(regOffset);
SetGpuReg(regOffset, regValue & ~mask); SetGpuReg(regOffset, regValue & ~mask);
} }
static void SyncRegIE(void) static void SyncRegIE(void)
{ {
if (sShouldSyncRegIE) { if (sShouldSyncRegIE) {
u16 temp = REG_IME; u16 temp = REG_IME;
REG_IME = 0; REG_IME = 0;
REG_IE = sRegIE; REG_IE = sRegIE;
REG_IME = temp; REG_IME = temp;
sShouldSyncRegIE = FALSE; sShouldSyncRegIE = FALSE;
} }
} }
void EnableInterrupts(u16 mask) void EnableInterrupts(u16 mask)
{ {
sRegIE |= mask; sRegIE |= mask;
sShouldSyncRegIE = TRUE; sShouldSyncRegIE = TRUE;
SyncRegIE(); SyncRegIE();
UpdateRegDispstatIntrBits(sRegIE); UpdateRegDispstatIntrBits(sRegIE);
} }
void DisableInterrupts(u16 mask) void DisableInterrupts(u16 mask)
{ {
sRegIE &= ~mask; sRegIE &= ~mask;
sShouldSyncRegIE = TRUE; sShouldSyncRegIE = TRUE;
SyncRegIE(); SyncRegIE();
UpdateRegDispstatIntrBits(sRegIE); UpdateRegDispstatIntrBits(sRegIE);
} }
static void UpdateRegDispstatIntrBits(u16 regIE) static void UpdateRegDispstatIntrBits(u16 regIE)
{ {
u16 oldValue = GetGpuReg(REG_OFFSET_DISPSTAT) & (DISPSTAT_HBLANK_INTR | DISPSTAT_VBLANK_INTR); u16 oldValue = GetGpuReg(REG_OFFSET_DISPSTAT) & (DISPSTAT_HBLANK_INTR | DISPSTAT_VBLANK_INTR);
u16 newValue = 0; u16 newValue = 0;
if (regIE & INTR_FLAG_VBLANK) if (regIE & INTR_FLAG_VBLANK)
newValue |= DISPSTAT_VBLANK_INTR; newValue |= DISPSTAT_VBLANK_INTR;
if (regIE & INTR_FLAG_HBLANK) if (regIE & INTR_FLAG_HBLANK)
newValue |= DISPSTAT_HBLANK_INTR; newValue |= DISPSTAT_HBLANK_INTR;
if (oldValue != newValue) if (oldValue != newValue)
SetGpuReg(REG_OFFSET_DISPSTAT, newValue); SetGpuReg(REG_OFFSET_DISPSTAT, newValue);
} }

2
src/hall_of_fame.c
View File

@ -6,7 +6,7 @@
#include "pokemon.h" #include "pokemon.h"
#include "text.h" #include "text.h"
#include "text_window.h" #include "text_window.h"
#include "malloc.h" #include "alloc.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "graphics.h" #include "graphics.h"
#include "main.h" #include "main.h"

6
src/intro.c
View File

@ -5,7 +5,7 @@
#include "task.h" #include "task.h"
#include "title_screen.h" #include "title_screen.h"
#include "libgcnmultiboot.h" #include "libgcnmultiboot.h"
#include "malloc.h" #include "alloc.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "link.h" #include "link.h"
#include "multiboot_pokemon_colosseum.h" #include "multiboot_pokemon_colosseum.h"
@ -62,10 +62,10 @@ static const u32 gIntro3MiscTiles[] = INCBIN_U32("graphics/intro/intro3_misc.4bp
static const u16 gIntro1FlygonPalette[] = INCBIN_U16("graphics/intro/intro1_flygon.gbapal"); static const u16 gIntro1FlygonPalette[] = INCBIN_U16("graphics/intro/intro1_flygon.gbapal");
static const u32 gIntro1EonTiles_Unused[] = INCBIN_U32("graphics/intro/intro1_eon.4bpp.lz"); static const u32 gIntro1EonTiles_Unused[] = INCBIN_U32("graphics/intro/intro1_eon.4bpp.lz");
static const u8 sUnknownBytes[] = { static const u8 sUnknownBytes[] = {
0x02, 0x03, 0x04, 0x05, 0x01, 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x02, 0x0D, 0x02, 0x03, 0x04, 0x05, 0x01, 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x02, 0x0D,
0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x02, 0x0D, 0x0E, 0x0F, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x02, 0x0D, 0x0E, 0x0F,
0x10, 0x11, 0x12, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x02, 0x0D, 0x0E, 0x0F, 0x10, 0x10, 0x11, 0x12, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x02, 0x0D, 0x0E, 0x0F, 0x10,
0x11, 0x12, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x00 0x11, 0x12, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x00
}; };
static const struct CompressedSpriteSheet gUnknown_085E4A74[] = static const struct CompressedSpriteSheet gUnknown_085E4A74[] =
{ {

270
src/item.c
View File

@ -4,7 +4,7 @@
#include "string_util.h" #include "string_util.h"
#include "text.h" #include "text.h"
#include "event_data.h" #include "event_data.h"
#include "malloc.h" #include "alloc.h"
#include "secret_base.h" #include "secret_base.h"
#include "item_menu.h" #include "item_menu.h"
#include "strings.h" #include "strings.h"
@ -244,152 +244,152 @@ NAKED
bool8 CheckBagHasSpace(u16 itemId, u16 count) bool8 CheckBagHasSpace(u16 itemId, u16 count)
{ {
asm_unified("push {r4-r7,lr}\n\ asm_unified("push {r4-r7,lr}\n\
mov r7, r10\n\ mov r7, r10\n\
mov r6, r9\n\ mov r6, r9\n\
mov r5, r8\n\ mov r5, r8\n\
push {r5-r7}\n\ push {r5-r7}\n\
sub sp, 0x4\n\ sub sp, 0x4\n\
lsls r0, 16\n\ lsls r0, 16\n\
lsrs r0, 16\n\ lsrs r0, 16\n\
mov r8, r0\n\ mov r8, r0\n\
lsls r1, 16\n\ lsls r1, 16\n\
lsrs r5, r1, 16\n\ lsrs r5, r1, 16\n\
bl ItemId_GetPocket\n\ bl ItemId_GetPocket\n\
lsls r0, 24\n\ lsls r0, 24\n\
cmp r0, 0\n\ cmp r0, 0\n\
beq _080D6906\n\ beq _080D6906\n\
bl InBattlePyramid\n\ bl InBattlePyramid\n\
lsls r0, 24\n\ lsls r0, 24\n\
cmp r0, 0\n\ cmp r0, 0\n\
bne _080D6838\n\ bne _080D6838\n\
ldr r0, =0x00004004\n\ ldr r0, =0x00004004\n\
bl FlagGet\n\ bl FlagGet\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r0, 24\n\ lsrs r0, 24\n\
cmp r0, 0x1\n\ cmp r0, 0x1\n\
bne _080D684C\n\ bne _080D684C\n\
_080D6838:\n\ _080D6838:\n\
mov r0, r8\n\ mov r0, r8\n\
adds r1, r5, 0\n\ adds r1, r5, 0\n\
bl CheckPyramidBagHasSpace\n\ bl CheckPyramidBagHasSpace\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r0, 24\n\ lsrs r0, 24\n\
b _080D6916\n\ b _080D6916\n\
.pool\n\ .pool\n\
_080D684C:\n\ _080D684C:\n\
mov r0, r8\n\ mov r0, r8\n\
bl ItemId_GetPocket\n\ bl ItemId_GetPocket\n\
subs r0, 0x1\n\ subs r0, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r2, r0, 24\n\ lsrs r2, r0, 24\n\
ldr r7, =0x000003e7\n\ ldr r7, =0x000003e7\n\
cmp r2, 0x3\n\ cmp r2, 0x3\n\
beq _080D6860\n\ beq _080D6860\n\
movs r7, 0x63\n\ movs r7, 0x63\n\
_080D6860:\n\ _080D6860:\n\
movs r6, 0\n\ movs r6, 0\n\
ldr r1, =gBagPockets\n\ ldr r1, =gBagPockets\n\
lsls r4, r2, 3\n\ lsls r4, r2, 3\n\
adds r0, r4, r1\n\ adds r0, r4, r1\n\
mov r9, r4\n\ mov r9, r4\n\
ldrb r0, [r0, 0x4]\n\ ldrb r0, [r0, 0x4]\n\
cmp r6, r0\n\ cmp r6, r0\n\
bcs _080D68BC\n\ bcs _080D68BC\n\
subs r0, r2, 0x2\n\ subs r0, r2, 0x2\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r0, 24\n\ lsrs r0, 24\n\
mov r10, r0\n\ mov r10, r0\n\
_080D6878:\n\ _080D6878:\n\
adds r0, r4, r1\n\ adds r0, r4, r1\n\
ldr r1, [r0]\n\ ldr r1, [r0]\n\
lsls r0, r6, 2\n\ lsls r0, r6, 2\n\
adds r1, r0, r1\n\ adds r1, r0, r1\n\
ldrh r0, [r1]\n\ ldrh r0, [r1]\n\
cmp r0, r8\n\ cmp r0, r8\n\
bne _080D68AC\n\ bne _080D68AC\n\
adds r0, r1, 0x2\n\ adds r0, r1, 0x2\n\
str r2, [sp]\n\ str r2, [sp]\n\
bl GetBagItemQuantity\n\ bl GetBagItemQuantity\n\
lsls r0, 16\n\ lsls r0, 16\n\
lsrs r1, r0, 16\n\ lsrs r1, r0, 16\n\
adds r0, r1, r5\n\ adds r0, r1, r5\n\
ldr r2, [sp]\n\ ldr r2, [sp]\n\
cmp r0, r7\n\ cmp r0, r7\n\
ble _080D6914\n\ ble _080D6914\n\
mov r0, r10\n\ mov r0, r10\n\
cmp r0, 0x1\n\ cmp r0, 0x1\n\
bls _080D6906\n\ bls _080D6906\n\
subs r0, r7, r1\n\ subs r0, r7, r1\n\
subs r0, r5, r0\n\ subs r0, r5, r0\n\
lsls r0, 16\n\ lsls r0, 16\n\
lsrs r5, r0, 16\n\ lsrs r5, r0, 16\n\
cmp r5, 0\n\ cmp r5, 0\n\
beq _080D6914\n\ beq _080D6914\n\
_080D68AC:\n\ _080D68AC:\n\
adds r0, r6, 0x1\n\ adds r0, r6, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r6, r0, 24\n\ lsrs r6, r0, 24\n\
ldr r1, =gBagPockets\n\ ldr r1, =gBagPockets\n\
adds r0, r4, r1\n\ adds r0, r4, r1\n\
ldrb r0, [r0, 0x4]\n\ ldrb r0, [r0, 0x4]\n\
cmp r6, r0\n\ cmp r6, r0\n\
bcc _080D6878\n\ bcc _080D6878\n\
_080D68BC:\n\ _080D68BC:\n\
cmp r5, 0\n\ cmp r5, 0\n\
beq _080D6914\n\ beq _080D6914\n\
movs r6, 0\n\ movs r6, 0\n\
ldr r3, =gBagPockets\n\ ldr r3, =gBagPockets\n\
mov r1, r9\n\ mov r1, r9\n\
adds r0, r1, r3\n\ adds r0, r1, r3\n\
ldrb r0, [r0, 0x4]\n\ ldrb r0, [r0, 0x4]\n\
cmp r6, r0\n\ cmp r6, r0\n\
bcs _080D6902\n\ bcs _080D6902\n\
adds r4, r3, 0\n\ adds r4, r3, 0\n\
subs r0, r2, 0x2\n\ subs r0, r2, 0x2\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r2, r0, 24\n\ lsrs r2, r0, 24\n\
_080D68D6:\n\ _080D68D6:\n\
adds r0, r1, r4\n\ adds r0, r1, r4\n\
ldr r1, [r0]\n\ ldr r1, [r0]\n\
lsls r0, r6, 2\n\ lsls r0, r6, 2\n\
adds r0, r1\n\ adds r0, r1\n\
ldrh r0, [r0]\n\ ldrh r0, [r0]\n\
cmp r0, 0\n\ cmp r0, 0\n\
bne _080D68F2\n\ bne _080D68F2\n\
cmp r5, r7\n\ cmp r5, r7\n\
bls _080D6914\n\ bls _080D6914\n\
cmp r2, 0x1\n\ cmp r2, 0x1\n\
bls _080D6906\n\ bls _080D6906\n\
subs r0, r5, r7\n\ subs r0, r5, r7\n\
lsls r0, 16\n\ lsls r0, 16\n\
lsrs r5, r0, 16\n\ lsrs r5, r0, 16\n\
_080D68F2:\n\ _080D68F2:\n\
adds r0, r6, 0x1\n\ adds r0, r6, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r6, r0, 24\n\ lsrs r6, r0, 24\n\
mov r1, r9\n\ mov r1, r9\n\
adds r0, r1, r3\n\ adds r0, r1, r3\n\
ldrb r0, [r0, 0x4]\n\ ldrb r0, [r0, 0x4]\n\
cmp r6, r0\n\ cmp r6, r0\n\
bcc _080D68D6\n\ bcc _080D68D6\n\
_080D6902:\n\ _080D6902:\n\
cmp r5, 0\n\ cmp r5, 0\n\
beq _080D6914\n\ beq _080D6914\n\
_080D6906:\n\ _080D6906:\n\
movs r0, 0\n\ movs r0, 0\n\
b _080D6916\n\ b _080D6916\n\
.pool\n\ .pool\n\
_080D6914:\n\ _080D6914:\n\
movs r0, 0x1\n\ movs r0, 0x1\n\
_080D6916:\n\ _080D6916:\n\
add sp, 0x4\n\ add sp, 0x4\n\
pop {r3-r5}\n\ pop {r3-r5}\n\
mov r8, r3\n\ mov r8, r3\n\
mov r9, r4\n\ mov r9, r4\n\
mov r10, r5\n\ mov r10, r5\n\
pop {r4-r7}\n\ pop {r4-r7}\n\
pop {r1}\n\ pop {r1}\n\
bx r1"); bx r1");
} }
#endif // NONMATCHING #endif // NONMATCHING

2
src/item_icon.c
View File

@ -2,7 +2,7 @@
#include "decompress.h" #include "decompress.h"
#include "graphics.h" #include "graphics.h"
#include "item_icon.h" #include "item_icon.h"
#include "malloc.h" #include "alloc.h"
#include "sprite.h" #include "sprite.h"
#include "constants/items.h" #include "constants/items.h"

2
src/item_menu.c
View File

@ -23,7 +23,7 @@
#include "link.h" #include "link.h"
#include "mail.h" #include "mail.h"
#include "main.h" #include "main.h"
#include "malloc.h" #include "alloc.h"
#include "map_name_popup.h" #include "map_name_popup.h"
#include "menu.h" #include "menu.h"
#include "money.h" #include "money.h"

4
src/landmark.c
View File

@ -338,8 +338,8 @@ static const struct Landmark *const Landmarks_MtChimney_2[] =
static const struct LandmarkList gLandmarkLists[] = static const struct LandmarkList gLandmarkLists[] =
{ {
{MAPSEC_ROUTE_103, 2, Landmarks_Route103_2}, {MAPSEC_ROUTE_103, 2, Landmarks_Route103_2},
{MAPSEC_ROUTE_104, 0, Landmarks_Route104_0}, {MAPSEC_ROUTE_104, 0, Landmarks_Route104_0},
{MAPSEC_ROUTE_104, 1, Landmarks_Route104_1}, {MAPSEC_ROUTE_104, 1, Landmarks_Route104_1},
{MAPSEC_ROUTE_105, 0, Landmarks_Route105_0}, {MAPSEC_ROUTE_105, 0, Landmarks_Route105_0},
{MAPSEC_ROUTE_106, 1, Landmarks_Route106_1}, {MAPSEC_ROUTE_106, 1, Landmarks_Route106_1},

2
src/learn_move.c
View File

@ -9,7 +9,7 @@
#include "gpu_regs.h" #include "gpu_regs.h"
#include "learn_move.h" #include "learn_move.h"
#include "list_menu.h" #include "list_menu.h"
#include "malloc.h" #include "alloc.h"
#include "menu.h" #include "menu.h"
#include "menu_helpers.h" #include "menu_helpers.h"
#include "overworld.h" #include "overworld.h"

2
src/link.c
View File

@ -2,7 +2,7 @@
// Includes // Includes
#include "global.h" #include "global.h"
#include "m4a.h" #include "m4a.h"
#include "malloc.h" #include "alloc.h"
#include "reset_save_heap.h" #include "reset_save_heap.h"
#include "save.h" #include "save.h"
#include "bg.h" #include "bg.h"

12
src/link_rfu.c
View File

@ -1,4 +1,5 @@
#include "global.h" #include "global.h"
#include "alloc.h"
#include "battle.h" #include "battle.h"
#include "berry_blender.h" #include "berry_blender.h"
#include "decompress.h" #include "decompress.h"
@ -7,7 +8,6 @@
#include "librfu.h" #include "librfu.h"
#include "link.h" #include "link.h"
#include "link_rfu.h" #include "link_rfu.h"
#include "malloc.h"
#include "overworld.h" #include "overworld.h"
#include "random.h" #include "random.h"
#include "palette.h" #include "palette.h"
@ -276,7 +276,7 @@ const struct {
{ gBlockSendBuffer, 40 } { gBlockSendBuffer, 40 }
}; };
const u16 gUnknown_082ED6E0[] = { const u16 gUnknown_082ED6E0[] = {
0x0002, 0x7f7d, 0x0000, 0xffff 0x0002, 0x7f7d, 0x0000, 0xFFFF
}; };
const char sUnref_082ED6E8[][15] = { const char sUnref_082ED6E8[][15] = {
@ -1469,7 +1469,7 @@ static u8 sub_800D294(void)
for (i = 0; i < gUnknown_03007890->unk_08; i++) for (i = 0; i < gUnknown_03007890->unk_08; i++)
{ {
for (ptr = gUnknown_03004140.unk_20; *ptr != 0xffff; ptr++) for (ptr = gUnknown_03004140.unk_20; *ptr != 0xFFFF; ptr++)
{ {
if (gUnknown_03007890->unk_14[i].unk_04 == *ptr) if (gUnknown_03007890->unk_14[i].unk_04 == *ptr)
{ {
@ -3077,7 +3077,7 @@ bool32 sub_800F1E0(void)
{ {
if (gUnknown_03005000.unk_14[i][1]) if (gUnknown_03005000.unk_14[i][1])
{ {
if (gUnknown_03005000.unk_cee[i] != 0xff && (gUnknown_03005000.unk_14[i][0] >> 5) != ((gUnknown_03005000.unk_cee[i] + 1) & 7)) if (gUnknown_03005000.unk_cee[i] != 0xFF && (gUnknown_03005000.unk_14[i][0] >> 5) != ((gUnknown_03005000.unk_cee[i] + 1) & 7))
{ {
if (++gUnknown_03005000.unk_cea[i] > 4) if (++gUnknown_03005000.unk_cea[i] > 4)
sub_8011170(0x8100); sub_8011170(0x8100);
@ -3778,7 +3778,7 @@ bool32 sub_8010454(u32 a0)
s32 i; s32 i;
for (i = 0; gUnknown_082ED6E0[i] != a0; i++) for (i = 0; gUnknown_082ED6E0[i] != a0; i++)
{ {
if (gUnknown_082ED6E0[i] == 0xffff) if (gUnknown_082ED6E0[i] == 0xFFFF)
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@ -3906,7 +3906,7 @@ void sub_80106D4(void)
u32 sub_8010714(u16 a0, const u8 *a1) u32 sub_8010714(u16 a0, const u8 *a1)
{ {
u8 r0 = sub_8011CE4(a1, a0); u8 r0 = sub_8011CE4(a1, a0);
if (r0 == 0xff) if (r0 == 0xFF)
return 2; return 2;
if (gUnknown_03007880[r0]->unk_0 == 0) if (gUnknown_03007880[r0]->unk_0 == 0)
return 1; return 1;

34
src/list_menu.c
View File

@ -8,7 +8,7 @@
#include "trig.h" #include "trig.h"
#include "decompress.h" #include "decompress.h"
#include "palette.h" #include "palette.h"
#include "malloc.h" #include "alloc.h"
#include "strings.h" #include "strings.h"
#include "sound.h" #include "sound.h"
#include "constants/songs.h" #include "constants/songs.h"
@ -953,52 +953,52 @@ void ListMenuSetUnkIndicatorsStructField(u8 taskId, u8 field, s32 value)
case 0: case 0:
case 1: case 1:
data->field_4 = (void*)(value); data->field_4 = (void*)(value);
break; break;
case 2: case 2:
data->field_C = value; data->field_C = value;
break; break;
case 3: case 3:
data->field_E = value; data->field_E = value;
break; break;
case 4: case 4:
data->field_10 = value; data->field_10 = value;
break; break;
case 5: case 5:
data->field_11 = value; data->field_11 = value;
break; break;
case 6: case 6:
data->field_12 = value; data->field_12 = value;
break; break;
case 7: case 7:
data->field_13 = value; data->field_13 = value;
break; break;
case 8: case 8:
data->field_14_0 = value; data->field_14_0 = value;
break; break;
case 9: case 9:
data->field_14_1 = value; data->field_14_1 = value;
break; break;
case 10: case 10:
data->field_15_0 = value; data->field_15_0 = value;
break; break;
case 11: case 11:
data->field_15_1 = value; data->field_15_1 = value;
break; break;
case 12: case 12:
data->field_16_0 = value; data->field_16_0 = value;
break; break;
case 13: case 13:
data->field_16_1 = value; data->field_16_1 = value;
break; break;
case 14: case 14:
data->field_16_2 = value; data->field_16_2 = value;
break; break;
case 15: case 15:
data->field_17_0 = value; data->field_17_0 = value;
break; break;
case 16: case 16:
data->field_17_1 = value; data->field_17_1 = value;
break; break;
} }
} }

2
src/load_save.c
View File

@ -4,7 +4,7 @@
#include "main.h" #include "main.h"
#include "pokemon.h" #include "pokemon.h"
#include "random.h" #include "random.h"
#include "malloc.h" #include "alloc.h"
#include "item.h" #include "item.h"
#include "overworld.h" #include "overworld.h"
#include "decoration_inventory.h" #include "decoration_inventory.h"

2
src/mail.c
View File

@ -17,7 +17,7 @@
#include "bg.h" #include "bg.h"
#include "pokemon_icon.h" #include "pokemon_icon.h"
#include "constants/species.h" #include "constants/species.h"
#include "malloc.h" #include "alloc.h"
#include "easy_chat.h" #include "easy_chat.h"
extern const u16 gMailPalette_Orange[]; extern const u16 gMailPalette_Orange[];

2
src/main.c
View File

@ -1,6 +1,6 @@
#include "global.h" #include "global.h"
#include "crt0.h" #include "crt0.h"
#include "malloc.h" #include "alloc.h"
#include "link.h" #include "link.h"
#include "link_rfu.h" #include "link_rfu.h"
#include "librfu.h" #include "librfu.h"

38
src/main_menu.c
View File

@ -335,25 +335,25 @@ static const struct MenuAction sMenuActions_Gender[] = {
static const u8 *const gMalePresetNames[] = { static const u8 *const gMalePresetNames[] = {
gText_DefaultNameStu, gText_DefaultNameStu,
gText_DefaultNameMilton, gText_DefaultNameMilton,
gText_DefaultNameTom, gText_DefaultNameTom,
gText_DefaultNameKenny, gText_DefaultNameKenny,
gText_DefaultNameReid, gText_DefaultNameReid,
gText_DefaultNameJude, gText_DefaultNameJude,
gText_DefaultNameJaxson, gText_DefaultNameJaxson,
gText_DefaultNameEaston, gText_DefaultNameEaston,
gText_DefaultNameWalker, gText_DefaultNameWalker,
gText_DefaultNameTeru, gText_DefaultNameTeru,
gText_DefaultNameJohnny, gText_DefaultNameJohnny,
gText_DefaultNameBrett, gText_DefaultNameBrett,
gText_DefaultNameSeth, gText_DefaultNameSeth,
gText_DefaultNameTerry, gText_DefaultNameTerry,
gText_DefaultNameCasey, gText_DefaultNameCasey,
gText_DefaultNameDarren, gText_DefaultNameDarren,
gText_DefaultNameLandon, gText_DefaultNameLandon,
gText_DefaultNameCollin, gText_DefaultNameCollin,
gText_DefaultNameStanley, gText_DefaultNameStanley,
gText_DefaultNameQuincy gText_DefaultNameQuincy
}; };
static const u8 *const gFemalePresetNames[] = { static const u8 *const gFemalePresetNames[] = {

210
src/malloc.c
View File

@ -1,210 +0,0 @@
#include "global.h"
static void *sHeapStart;
static u32 sHeapSize;
static u32 malloc_c_unused_0300000c; // needed to align dma3_manager.o(.bss)
#define MALLOC_SYSTEM_ID 0xA3A3
struct MemBlock {
// Whether this block is currently allocated.
bool16 flag;
// Magic number used for error checking. Should equal MALLOC_SYSTEM_ID.
u16 magic;
// Size of the block (not including this header struct).
u32 size;
// Previous block pointer. Equals sHeapStart if this is the first block.
struct MemBlock *prev;
// Next block pointer. Equals sHeapStart if this is the last block.
struct MemBlock *next;
// Data in the memory block. (Arrays of length 0 are a GNU extension.)
u8 data[0];
};
void PutMemBlockHeader(void *block, struct MemBlock *prev, struct MemBlock *next, u32 size)
{
struct MemBlock *header = (struct MemBlock *)block;
header->flag = FALSE;
header->magic = MALLOC_SYSTEM_ID;
header->size = size;
header->prev = prev;
header->next = next;
}
void PutFirstMemBlockHeader(void *block, u32 size)
{
PutMemBlockHeader(block, (struct MemBlock *)block, (struct MemBlock *)block, size - sizeof(struct MemBlock));
}
void *AllocInternal(void *heapStart, u32 size)
{
struct MemBlock *pos = (struct MemBlock *)heapStart;
struct MemBlock *head = pos;
struct MemBlock *splitBlock;
u32 foundBlockSize;
// Alignment
if (size & 3)
size = 4 * ((size / 4) + 1);
for (;;) {
// Loop through the blocks looking for unused block that's big enough.
if (!pos->flag) {
foundBlockSize = pos->size;
if (foundBlockSize >= size) {
if (foundBlockSize - size < 2 * sizeof(struct MemBlock)) {
// The block isn't much bigger than the requested size,
// so just use it.
pos->flag = TRUE;
} else {
// The block is significantly bigger than the requested
// size, so split the rest into a separate block.
foundBlockSize -= sizeof(struct MemBlock);
foundBlockSize -= size;
splitBlock = (struct MemBlock *)(pos->data + size);
pos->flag = TRUE;
pos->size = size;
PutMemBlockHeader(splitBlock, pos, pos->next, foundBlockSize);
pos->next = splitBlock;
if (splitBlock->next != head)
splitBlock->next->prev = splitBlock;
}
return pos->data;
}
}
if (pos->next == head)
return NULL;
pos = pos->next;
}
}
void FreeInternal(void *heapStart, void *pointer)
{
if (pointer) {
struct MemBlock *head = (struct MemBlock *)heapStart;
struct MemBlock *block = (struct MemBlock *)((u8 *)pointer - sizeof(struct MemBlock));
block->flag = FALSE;
// If the freed block isn't the last one, merge with the next block
// if it's not in use.
if (block->next != head) {
if (!block->next->flag) {
block->size += sizeof(struct MemBlock) + block->next->size;
block->next->magic = 0;
block->next = block->next->next;
if (block->next != head)
block->next->prev = block;
}
}
// If the freed block isn't the first one, merge with the previous block
// if it's not in use.
if (block != head) {
if (!block->prev->flag) {
block->prev->next = block->next;
if (block->next != head)
block->next->prev = block->prev;
block->magic = 0;
block->prev->size += sizeof(struct MemBlock) + block->size;
}
}
}
}
void *AllocZeroedInternal(void *heapStart, u32 size)
{
void *mem = AllocInternal(heapStart, size);
if (mem != NULL) {
if (size & 3)
size = 4 * ((size / 4) + 1);
CpuFill32(0, mem, size);
}
return mem;
}
bool32 CheckMemBlockInternal(void *heapStart, void *pointer)
{
struct MemBlock *head = (struct MemBlock *)heapStart;
struct MemBlock *block = (struct MemBlock *)((u8 *)pointer - sizeof(struct MemBlock));
if (block->magic != MALLOC_SYSTEM_ID)
return FALSE;
if (block->next->magic != MALLOC_SYSTEM_ID)
return FALSE;
if (block->next != head && block->next->prev != block)
return FALSE;
if (block->prev->magic != MALLOC_SYSTEM_ID)
return FALSE;
if (block->prev != head && block->prev->next != block)
return FALSE;
if (block->next != head && block->next != (struct MemBlock *)(block->data + block->size))
return FALSE;
return TRUE;
}
void InitHeap(void *heapStart, u32 heapSize)
{
sHeapStart = heapStart;
sHeapSize = heapSize;
PutFirstMemBlockHeader(heapStart, heapSize);
}
void *Alloc(u32 size)
{
AllocInternal(sHeapStart, size);
}
void *AllocZeroed(u32 size)
{
AllocZeroedInternal(sHeapStart, size);
}
void Free(void *pointer)
{
FreeInternal(sHeapStart, pointer);
}
bool32 CheckMemBlock(void *pointer)
{
return CheckMemBlockInternal(sHeapStart, pointer);
}
bool32 CheckHeap()
{
struct MemBlock *pos = (struct MemBlock *)sHeapStart;
do {
if (!CheckMemBlockInternal(sHeapStart, pos->data))
return FALSE;
pos = pos->next;
} while (pos != (struct MemBlock *)sHeapStart);
return TRUE;
}

462
src/menu.c
View File

@ -7,7 +7,7 @@
#include "main.h" #include "main.h"
#include "sound.h" #include "sound.h"
#include "menu_helpers.h" #include "menu_helpers.h"
#include "malloc.h" #include "alloc.h"
#include "task.h" #include "task.h"
#include "dma3.h" #include "dma3.h"
#include "string_util.h" #include "string_util.h"
@ -2096,253 +2096,253 @@ void sub_819A080(struct UnkStruct_819A080 *a0, struct UnkStruct_819A080 *a1, u16
NAKED NAKED
void sub_819A080(struct UnkStruct_819A080 *a0, struct UnkStruct_819A080 *a1, u16 a2, u16 a3, u16 a4, u16 a5, u16 a6, u16 a7) void sub_819A080(struct UnkStruct_819A080 *a0, struct UnkStruct_819A080 *a1, u16 a2, u16 a3, u16 a4, u16 a5, u16 a6, u16 a7)
{ {
asm("push {r4-r7,lr}\n\ asm("push {r4-r7,lr}\n\
mov r7, r10\n\ mov r7, r10\n\
mov r6, r9\n\ mov r6, r9\n\
mov r5, r8\n\ mov r5, r8\n\
push {r5-r7}\n\ push {r5-r7}\n\
sub sp, #0x28\n\ sub sp, #0x28\n\
str r0, [sp]\n\ str r0, [sp]\n\
str r1, [sp, #0x4]\n\ str r1, [sp, #0x4]\n\
ldr r0, [sp, #0x48]\n\ ldr r0, [sp, #0x48]\n\
ldr r4, [sp, #0x4C]\n\ ldr r4, [sp, #0x4C]\n\
ldr r1, [sp, #0x50]\n\ ldr r1, [sp, #0x50]\n\
ldr r5, [sp, #0x54]\n\ ldr r5, [sp, #0x54]\n\
lsl r2, #16\n\ lsl r2, #16\n\
lsr r2, #16\n\ lsr r2, #16\n\
str r2, [sp, #0x8]\n\ str r2, [sp, #0x8]\n\
lsl r3, #16\n\ lsl r3, #16\n\
lsr r3, #16\n\ lsr r3, #16\n\
lsl r0, #16\n\ lsl r0, #16\n\
lsr r0, #16\n\ lsr r0, #16\n\
str r0, [sp, #0xC]\n\ str r0, [sp, #0xC]\n\
lsl r4, #16\n\ lsl r4, #16\n\
lsr r4, #16\n\ lsr r4, #16\n\
lsl r1, #16\n\ lsl r1, #16\n\
lsr r1, #16\n\ lsr r1, #16\n\
lsl r5, #16\n\ lsl r5, #16\n\
lsr r5, #16\n\ lsr r5, #16\n\
ldr r2, [sp, #0x4]\n\ ldr r2, [sp, #0x4]\n\
ldrh r0, [r2, #0x4]\n\ ldrh r0, [r2, #0x4]\n\
ldr r2, [sp, #0xC]\n\ ldr r2, [sp, #0xC]\n\
sub r0, r2\n\ sub r0, r2\n\
ldr r2, [sp, #0x8]\n\ ldr r2, [sp, #0x8]\n\
add r2, r1, r2\n\ add r2, r1, r2\n\
str r2, [sp, #0x10]\n\ str r2, [sp, #0x10]\n\
cmp r0, r1\n\ cmp r0, r1\n\
bge _0819A0CC\n\ bge _0819A0CC\n\
ldr r1, [sp, #0x8]\n\ ldr r1, [sp, #0x8]\n\
add r0, r1\n\ add r0, r1\n\
str r0, [sp, #0x10]\n\ str r0, [sp, #0x10]\n\
_0819A0CC:\n\ _0819A0CC:\n\
ldr r2, [sp, #0x4]\n\ ldr r2, [sp, #0x4]\n\
ldrh r1, [r2, #0x6]\n\ ldrh r1, [r2, #0x6]\n\
sub r0, r1, r4\n\ sub r0, r1, r4\n\
cmp r0, r5\n\ cmp r0, r5\n\
bge _0819A0DE\n\ bge _0819A0DE\n\
add r0, r3, r1\n\ add r0, r3, r1\n\
sub r0, r4\n\ sub r0, r4\n\
str r0, [sp, #0x14]\n\ str r0, [sp, #0x14]\n\
b _0819A0E2\n\ b _0819A0E2\n\
_0819A0DE:\n\ _0819A0DE:\n\
add r5, r3, r5\n\ add r5, r3, r5\n\
str r5, [sp, #0x14]\n\ str r5, [sp, #0x14]\n\
_0819A0E2:\n\ _0819A0E2:\n\
ldr r0, [sp]\n\ ldr r0, [sp]\n\
ldrh r1, [r0, #0x4]\n\ ldrh r1, [r0, #0x4]\n\
mov r2, #0x7\n\ mov r2, #0x7\n\
add r0, r1, #0\n\ add r0, r1, #0\n\
and r0, r2\n\ and r0, r2\n\
add r1, r0\n\ add r1, r0\n\
asr r1, #3\n\ asr r1, #3\n\
str r1, [sp, #0x18]\n\ str r1, [sp, #0x18]\n\
ldr r0, [sp, #0x4]\n\ ldr r0, [sp, #0x4]\n\
ldrh r1, [r0, #0x4]\n\ ldrh r1, [r0, #0x4]\n\
add r0, r1, #0\n\ add r0, r1, #0\n\
and r0, r2\n\ and r0, r2\n\
add r1, r0\n\ add r1, r0\n\
asr r1, #3\n\ asr r1, #3\n\
str r1, [sp, #0x1C]\n\ str r1, [sp, #0x1C]\n\
mov r12, r3\n\ mov r12, r3\n\
mov r8, r4\n\ mov r8, r4\n\
ldr r1, [sp, #0x14]\n\ ldr r1, [sp, #0x14]\n\
cmp r12, r1\n\ cmp r12, r1\n\
blt _0819A10C\n\ blt _0819A10C\n\
b _0819A24A\n\ b _0819A24A\n\
_0819A10C:\n\ _0819A10C:\n\
ldr r5, [sp, #0x8]\n\ ldr r5, [sp, #0x8]\n\
ldr r6, [sp, #0xC]\n\ ldr r6, [sp, #0xC]\n\
mov r2, r12\n\ mov r2, r12\n\
add r2, #0x1\n\ add r2, #0x1\n\
str r2, [sp, #0x20]\n\ str r2, [sp, #0x20]\n\
mov r0, r8\n\ mov r0, r8\n\
add r0, #0x1\n\ add r0, #0x1\n\
str r0, [sp, #0x24]\n\ str r0, [sp, #0x24]\n\
ldr r1, [sp, #0x10]\n\ ldr r1, [sp, #0x10]\n\
cmp r5, r1\n\ cmp r5, r1\n\
blt _0819A124\n\ blt _0819A124\n\
b _0819A23A\n\ b _0819A23A\n\
_0819A124:\n\ _0819A124:\n\
mov r7, #0x1\n\ mov r7, #0x1\n\
mov r2, #0xF0\n\ mov r2, #0xF0\n\
mov r10, r2\n\ mov r10, r2\n\
mov r0, #0xF\n\ mov r0, #0xF\n\
mov r9, r0\n\ mov r9, r0\n\
_0819A12E:\n\ _0819A12E:\n\
asr r0, r5, #1\n\ asr r0, r5, #1\n\
mov r1, #0x3\n\ mov r1, #0x3\n\
and r0, r1\n\ and r0, r1\n\
ldr r2, [sp]\n\ ldr r2, [sp]\n\
ldr r1, [r2]\n\ ldr r1, [r2]\n\
add r1, r0\n\ add r1, r0\n\
asr r0, r5, #3\n\ asr r0, r5, #3\n\
lsl r0, #5\n\ lsl r0, #5\n\
add r1, r0\n\ add r1, r0\n\
mov r2, r12\n\ mov r2, r12\n\
asr r0, r2, #3\n\ asr r0, r2, #3\n\
ldr r2, [sp, #0x18]\n\ ldr r2, [sp, #0x18]\n\
mul r0, r2\n\ mul r0, r2\n\
lsl r0, #5\n\ lsl r0, #5\n\
add r1, r0\n\ add r1, r0\n\
mov r2, r12\n\ mov r2, r12\n\
lsl r0, r2, #29\n\ lsl r0, r2, #29\n\
lsr r0, #27\n\ lsr r0, #27\n\
add r3, r1, r0\n\ add r3, r1, r0\n\
asr r0, r6, #1\n\ asr r0, r6, #1\n\
mov r1, #0x3\n\ mov r1, #0x3\n\
and r0, r1\n\ and r0, r1\n\
ldr r2, [sp, #0x4]\n\ ldr r2, [sp, #0x4]\n\
ldr r1, [r2]\n\ ldr r1, [r2]\n\
add r1, r0\n\ add r1, r0\n\
asr r0, r6, #3\n\ asr r0, r6, #3\n\
lsl r0, #5\n\ lsl r0, #5\n\
add r1, r0\n\ add r1, r0\n\
mov r2, r8\n\ mov r2, r8\n\
asr r0, r2, #3\n\ asr r0, r2, #3\n\
ldr r2, [sp, #0x1C]\n\ ldr r2, [sp, #0x1C]\n\
mul r0, r2\n\ mul r0, r2\n\
lsl r0, #5\n\ lsl r0, #5\n\
add r1, r0\n\ add r1, r0\n\
mov r2, r8\n\ mov r2, r8\n\
lsl r0, r2, #29\n\ lsl r0, r2, #29\n\
lsr r0, #27\n\ lsr r0, #27\n\
add r4, r1, r0\n\ add r4, r1, r0\n\
add r0, r4, #0\n\ add r0, r4, #0\n\
and r0, r7\n\ and r0, r7\n\
cmp r0, #0\n\ cmp r0, #0\n\
beq _0819A1DA\n\ beq _0819A1DA\n\
sub r4, #0x1\n\ sub r4, #0x1\n\
add r0, r6, #0\n\ add r0, r6, #0\n\
and r0, r7\n\ and r0, r7\n\
cmp r0, #0\n\ cmp r0, #0\n\
beq _0819A1B2\n\ beq _0819A1B2\n\
ldrh r0, [r4]\n\ ldrh r0, [r4]\n\
ldr r2, =0x00000fff\n\ ldr r2, =0x00000fff\n\
and r2, r0\n\ and r2, r0\n\
add r0, r5, #0\n\ add r0, r5, #0\n\
and r0, r7\n\ and r0, r7\n\
cmp r0, #0\n\ cmp r0, #0\n\
beq _0819A1A8\n\ beq _0819A1A8\n\
ldrb r1, [r3]\n\ ldrb r1, [r3]\n\
mov r0, r10\n\ mov r0, r10\n\
and r0, r1\n\ and r0, r1\n\
lsl r0, #8\n\ lsl r0, #8\n\
b _0819A22A\n\ b _0819A22A\n\
.pool\n\ .pool\n\
_0819A1A8:\n\ _0819A1A8:\n\
ldrb r1, [r3]\n\ ldrb r1, [r3]\n\
mov r0, r9\n\ mov r0, r9\n\
and r0, r1\n\ and r0, r1\n\
lsl r0, #12\n\ lsl r0, #12\n\
b _0819A22A\n\ b _0819A22A\n\
_0819A1B2:\n\ _0819A1B2:\n\
ldrh r0, [r4]\n\ ldrh r0, [r4]\n\
ldr r2, =0x0000f0ff\n\ ldr r2, =0x0000f0ff\n\
and r2, r0\n\ and r2, r0\n\
add r0, r5, #0\n\ add r0, r5, #0\n\
and r0, r7\n\ and r0, r7\n\
cmp r0, #0\n\ cmp r0, #0\n\
beq _0819A1D0\n\ beq _0819A1D0\n\
ldrb r1, [r3]\n\ ldrb r1, [r3]\n\
mov r0, r10\n\ mov r0, r10\n\
and r0, r1\n\ and r0, r1\n\
lsl r0, #4\n\ lsl r0, #4\n\
b _0819A22A\n\ b _0819A22A\n\
.pool\n\ .pool\n\
_0819A1D0:\n\ _0819A1D0:\n\
ldrb r1, [r3]\n\ ldrb r1, [r3]\n\
mov r0, r9\n\ mov r0, r9\n\
and r0, r1\n\ and r0, r1\n\
lsl r0, #8\n\ lsl r0, #8\n\
b _0819A22A\n\ b _0819A22A\n\
_0819A1DA:\n\ _0819A1DA:\n\
add r0, r6, #0\n\ add r0, r6, #0\n\
and r0, r7\n\ and r0, r7\n\
cmp r0, #0\n\ cmp r0, #0\n\
beq _0819A206\n\ beq _0819A206\n\
ldrh r0, [r4]\n\ ldrh r0, [r4]\n\
ldr r2, =0x0000ff0f\n\ ldr r2, =0x0000ff0f\n\
and r2, r0\n\ and r2, r0\n\
add r0, r5, #0\n\ add r0, r5, #0\n\
and r0, r7\n\ and r0, r7\n\
cmp r0, #0\n\ cmp r0, #0\n\
beq _0819A1FC\n\ beq _0819A1FC\n\
ldrb r1, [r3]\n\ ldrb r1, [r3]\n\
mov r0, r10\n\ mov r0, r10\n\
b _0819A228\n\ b _0819A228\n\
.pool\n\ .pool\n\
_0819A1FC:\n\ _0819A1FC:\n\
ldrb r1, [r3]\n\ ldrb r1, [r3]\n\
mov r0, r9\n\ mov r0, r9\n\
and r0, r1\n\ and r0, r1\n\
lsl r0, #4\n\ lsl r0, #4\n\
b _0819A22A\n\ b _0819A22A\n\
_0819A206:\n\ _0819A206:\n\
ldrh r0, [r4]\n\ ldrh r0, [r4]\n\
ldr r2, =0x0000fff0\n\ ldr r2, =0x0000fff0\n\
and r2, r0\n\ and r2, r0\n\
add r0, r5, #0\n\ add r0, r5, #0\n\
and r0, r7\n\ and r0, r7\n\
cmp r0, #0\n\ cmp r0, #0\n\
beq _0819A224\n\ beq _0819A224\n\
ldrb r1, [r3]\n\ ldrb r1, [r3]\n\
mov r0, r10\n\ mov r0, r10\n\
and r0, r1\n\ and r0, r1\n\
lsr r0, #4\n\ lsr r0, #4\n\
b _0819A22A\n\ b _0819A22A\n\
.pool\n\ .pool\n\
_0819A224:\n\ _0819A224:\n\
ldrb r1, [r3]\n\ ldrb r1, [r3]\n\
mov r0, r9\n\ mov r0, r9\n\
_0819A228:\n\ _0819A228:\n\
and r0, r1\n\ and r0, r1\n\
_0819A22A:\n\ _0819A22A:\n\
orr r2, r0\n\ orr r2, r0\n\
strh r2, [r4]\n\ strh r2, [r4]\n\
add r5, #0x1\n\ add r5, #0x1\n\
add r6, #0x1\n\ add r6, #0x1\n\
ldr r0, [sp, #0x10]\n\ ldr r0, [sp, #0x10]\n\
cmp r5, r0\n\ cmp r5, r0\n\
bge _0819A23A\n\ bge _0819A23A\n\
b _0819A12E\n\ b _0819A12E\n\
_0819A23A:\n\ _0819A23A:\n\
ldr r1, [sp, #0x20]\n\ ldr r1, [sp, #0x20]\n\
mov r12, r1\n\ mov r12, r1\n\
ldr r2, [sp, #0x24]\n\ ldr r2, [sp, #0x24]\n\
mov r8, r2\n\ mov r8, r2\n\
ldr r0, [sp, #0x14]\n\ ldr r0, [sp, #0x14]\n\
cmp r12, r0\n\ cmp r12, r0\n\
bge _0819A24A\n\ bge _0819A24A\n\
b _0819A10C\n\ b _0819A10C\n\
_0819A24A:\n\ _0819A24A:\n\
add sp, #0x28\n\ add sp, #0x28\n\
pop {r3-r5}\n\ pop {r3-r5}\n\
mov r8, r3\n\ mov r8, r3\n\
mov r9, r4\n\ mov r9, r4\n\
mov r10, r5\n\ mov r10, r5\n\
pop {r4-r7}\n\ pop {r4-r7}\n\
pop {r0}\n\ pop {r0}\n\
bx r0\n"); bx r0\n");
} }
#endif #endif

480
src/metatile_behavior.c
View File

@ -10,246 +10,246 @@
// wonder what the third flag is supposed to do // wonder what the third flag is supposed to do
static const u8 sTileBitAttributes[] = static const u8 sTileBitAttributes[] =
{ {
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_NORMAL [MB_NORMAL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_WALL [MB_SECRET_BASE_WALL] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, TRUE), // MB_TALL_GRASS [MB_TALL_GRASS] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE),
TILE_ATTRIBUTES(TRUE, FALSE, TRUE), // MB_LONG_GRASS [MB_LONG_GRASS] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_04 [MB_UNUSED_04] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, TRUE), // MB_UNUSED_05 [MB_UNUSED_05] = TILE_ATTRIBUTES(FALSE, FALSE, TRUE),
TILE_ATTRIBUTES(TRUE, FALSE, TRUE), // MB_DEEP_SAND [MB_DEEP_SAND] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SHORT_GRASS [MB_SHORT_GRASS] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, TRUE), // MB_UNUSED_CAVE [MB_UNUSED_CAVE] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_LONG_GRASS_SOUTH_EDGE [MB_LONG_GRASS_SOUTH_EDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_NO_RUNNING [MB_NO_RUNNING] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, TRUE), // MB_INDOOR_ENCOUNTER [MB_INDOOR_ENCOUNTER] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_MOUNTAIN_TOP [MB_MOUNTAIN_TOP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_BATTLE_PYRAMID_WARP [MB_BATTLE_PYRAMID_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_MOSSDEEP_GYM_WARP [MB_MOSSDEEP_GYM_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_MT_PYRE_HOLE [MB_MT_PYRE_HOLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, TRUE, TRUE), // MB_POND_WATER [MB_POND_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE),
TILE_ATTRIBUTES(TRUE, TRUE, TRUE), // MB_SEMI_DEEP_WATER [MB_SEMI_DEEP_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE),
TILE_ATTRIBUTES(TRUE, TRUE, TRUE), // MB_DEEP_WATER [MB_DEEP_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE),
TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_WATERFALL [MB_WATERFALL] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_SOOTOPOLIS_DEEP_WATER [MB_SOOTOPOLIS_DEEP_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
TILE_ATTRIBUTES(TRUE, TRUE, TRUE), // MB_OCEAN_WATER [MB_OCEAN_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_PUDDLE [MB_PUDDLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SHALLOW_WATER [MB_SHALLOW_WATER] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_SOOTOPOLIS_DEEP_WATER [MB_UNUSED_SOOTOPOLIS_DEEP_WATER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_NO_SURFACING [MB_NO_SURFACING] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_SOOTOPOLIS_DEEP_WATER_2 [MB_UNUSED_SOOTOPOLIS_DEEP_WATER_2] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_STAIRS_OUTSIDE_ABANDONED_SHIP [MB_STAIRS_OUTSIDE_ABANDONED_SHIP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SHOAL_CAVE_ENTRANCE [MB_SHOAL_CAVE_ENTRANCE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_1D [MB_UNUSED_1D] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_1E [MB_UNUSED_1E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_1F [MB_UNUSED_1F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ICE [MB_ICE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SAND [MB_SAND] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, TRUE, TRUE), // MB_SEAWEED [MB_SEAWEED] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_UNUSED_23 [MB_UNUSED_23] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, TRUE), // MB_ASHGRASS [MB_ASHGRASS] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE),
TILE_ATTRIBUTES(TRUE, FALSE, TRUE), // MB_FOOTPRINTS [MB_FOOTPRINTS] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_THIN_ICE [MB_THIN_ICE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_CRACKED_ICE [MB_CRACKED_ICE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_HOT_SPRINGS [MB_HOT_SPRINGS] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_LAVARIDGE_GYM_B1F_WARP [MB_LAVARIDGE_GYM_B1F_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, TRUE, TRUE), // MB_SEAWEED_NO_SURFACING [MB_SEAWEED_NO_SURFACING] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_REFLECTION_UNDER_BRIDGE [MB_REFLECTION_UNDER_BRIDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2C [MB_UNUSED_2C] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2D [MB_UNUSED_2D] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2E [MB_UNUSED_2E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2F [MB_UNUSED_2F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_EAST [MB_IMPASSABLE_EAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_WEST [MB_IMPASSABLE_WEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_NORTH [MB_IMPASSABLE_NORTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_SOUTH [MB_IMPASSABLE_SOUTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_NORTHEAST [MB_IMPASSABLE_NORTHEAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_NORTHWEST [MB_IMPASSABLE_NORTHWEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_SOUTHEAST [MB_IMPASSABLE_SOUTHEAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_SOUTHWEST [MB_IMPASSABLE_SOUTHWEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_JUMP_EAST [MB_JUMP_EAST] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_JUMP_WEST [MB_JUMP_WEST] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_JUMP_NORTH [MB_JUMP_NORTH] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_JUMP_SOUTH [MB_JUMP_SOUTH] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_JUMP_NORTHEAST [MB_JUMP_NORTHEAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_JUMP_NORTHWEST [MB_JUMP_NORTHWEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_JUMP_SOUTHEAST [MB_JUMP_SOUTHEAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_JUMP_SOUTHWEST [MB_JUMP_SOUTHWEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_WALK_EAST [MB_WALK_EAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_WALK_WEST [MB_WALK_WEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_WALK_NORTH [MB_WALK_NORTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_WALK_SOUTH [MB_WALK_SOUTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SLIDE_EAST [MB_SLIDE_EAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SLIDE_WEST [MB_SLIDE_WEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SLIDE_NORTH [MB_SLIDE_NORTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SLIDE_SOUTH [MB_SLIDE_SOUTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_TRICK_HOUSE_PUZZLE_8_FLOOR [MB_TRICK_HOUSE_PUZZLE_8_FLOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_UNUSED_49 [MB_UNUSED_49] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_UNUSED_4A [MB_UNUSED_4A] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4B [MB_UNUSED_4B] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4C [MB_UNUSED_4C] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4D [MB_UNUSED_4D] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4E [MB_UNUSED_4E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4F [MB_UNUSED_4F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_EASTWARD_CURRENT [MB_EASTWARD_CURRENT] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_WESTWARD_CURRENT [MB_WESTWARD_CURRENT] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_NORTHWARD_CURRENT [MB_NORTHWARD_CURRENT] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_SOUTHWARD_CURRENT [MB_SOUTHWARD_CURRENT] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_54 [MB_UNUSED_54] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_55 [MB_UNUSED_55] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_56 [MB_UNUSED_56] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_57 [MB_UNUSED_57] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_58 [MB_UNUSED_58] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_59 [MB_UNUSED_59] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5A [MB_UNUSED_5A] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5B [MB_UNUSED_5B] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5C [MB_UNUSED_5C] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5D [MB_UNUSED_5D] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5E [MB_UNUSED_5E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5F [MB_UNUSED_5F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_NON_ANIMATED_DOOR [MB_NON_ANIMATED_DOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_LADDER [MB_LADDER] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_EAST_ARROW_WARP [MB_EAST_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_WEST_ARROW_WARP [MB_WEST_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_NORTH_ARROW_WARP [MB_NORTH_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SOUTH_ARROW_WARP [MB_SOUTH_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_CRACKED_FLOOR_HOLE [MB_CRACKED_FLOOR_HOLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_AQUA_HIDEOUT_WARP [MB_AQUA_HIDEOUT_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_LAVARIDGE_GYM_1F_WARP [MB_LAVARIDGE_GYM_1F_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ANIMATED_DOOR [MB_ANIMATED_DOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_UP_ESCALATOR [MB_UP_ESCALATOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_DOWN_ESCALATOR [MB_DOWN_ESCALATOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_WATER_DOOR [MB_WATER_DOOR] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_WATER_SOUTH_ARROW_WARP [MB_WATER_SOUTH_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_DEEP_SOUTH_WARP [MB_DEEP_SOUTH_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_UNUSED_6F [MB_UNUSED_6F] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_WARP_OR_BRIDGE [MB_WARP_OR_BRIDGE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_UNUSED_71 [MB_UNUSED_71] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ROUTE120_NORTH_BRIDGE_1 [MB_ROUTE120_NORTH_BRIDGE_1] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ROUTE120_NORTH_BRIDGE_2 [MB_ROUTE120_NORTH_BRIDGE_2] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_PACIFIDLOG_VERTICAL_LOG_1 [MB_PACIFIDLOG_VERTICAL_LOG_1] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_PACIFIDLOG_VERTICAL_LOG_2 [MB_PACIFIDLOG_VERTICAL_LOG_2] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_PACIFIDLOG_HORIZONTAL_LOG_1 [MB_PACIFIDLOG_HORIZONTAL_LOG_1] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_PACIFIDLOG_HORIZONTAL_LOG_2 [MB_PACIFIDLOG_HORIZONTAL_LOG_2] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_FORTREE_BRIDGE [MB_FORTREE_BRIDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_79 [MB_UNUSED_79] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ROUTE120_SOUTH_BRIDGE_1 [MB_ROUTE120_SOUTH_BRIDGE_1] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ROUTE120_SOUTH_BRIDGE_2 [MB_ROUTE120_SOUTH_BRIDGE_2] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ROUTE120_NORTH_BRIDGE_3 [MB_ROUTE120_NORTH_BRIDGE_3] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ROUTE120_NORTH_BRIDGE_4 [MB_ROUTE120_NORTH_BRIDGE_4] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_UNUSED_7E [MB_UNUSED_7E] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ROUTE110_BRIDGE [MB_ROUTE110_BRIDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_COUNTER [MB_COUNTER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_81 [MB_UNUSED_81] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_82 [MB_UNUSED_82] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_PC [MB_PC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_CABLE_BOX_RESULTS_1 [MB_CABLE_BOX_RESULTS_1] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_REGION_MAP [MB_REGION_MAP] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_TELEVISION [MB_TELEVISION] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_POKEBLOCK_FEEDER [MB_POKEBLOCK_FEEDER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_88 [MB_UNUSED_88] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SLOT_MACHINE [MB_SLOT_MACHINE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_ROULETTE [MB_ROULETTE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_CLOSED_SOOTOPOLIS_DOOR [MB_CLOSED_SOOTOPOLIS_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_TRICK_HOUSE_PUZZLE_DOOR [MB_TRICK_HOUSE_PUZZLE_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_PETALBURG_GYM_DOOR [MB_PETALBURG_GYM_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_RUNNING_SHOES_INSTRUCTION [MB_RUNNING_SHOES_INSTRUCTION] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_QUESTIONNAIRE [MB_QUESTIONNAIRE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_RED_CAVE [MB_SECRET_BASE_SPOT_RED_CAVE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_RED_CAVE_OPEN [MB_SECRET_BASE_SPOT_RED_CAVE_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BROWN_CAVE [MB_SECRET_BASE_SPOT_BROWN_CAVE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BROWN_CAVE_OPEN [MB_SECRET_BASE_SPOT_BROWN_CAVE_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_YELLOW_CAVE [MB_SECRET_BASE_SPOT_YELLOW_CAVE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_YELLOW_CAVE_OPEN [MB_SECRET_BASE_SPOT_YELLOW_CAVE_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_LEFT [MB_SECRET_BASE_SPOT_TREE_LEFT] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_LEFT_OPEN [MB_SECRET_BASE_SPOT_TREE_LEFT_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_SHRUB [MB_SECRET_BASE_SPOT_SHRUB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_SHRUB_OPEN [MB_SECRET_BASE_SPOT_SHRUB_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BLUE_CAVE [MB_SECRET_BASE_SPOT_BLUE_CAVE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BLUE_CAVE_OPEN [MB_SECRET_BASE_SPOT_BLUE_CAVE_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_RIGHT [MB_SECRET_BASE_SPOT_TREE_RIGHT] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_RIGHT_OPEN [MB_SECRET_BASE_SPOT_TREE_RIGHT_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_9E [MB_UNUSED_9E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_9F [MB_UNUSED_9F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_BERRY_TREE_SOIL [MB_BERRY_TREE_SOIL] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A1 [MB_UNUSED_A1] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A2 [MB_UNUSED_A2] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A3 [MB_UNUSED_A3] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A4 [MB_UNUSED_A4] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A5 [MB_UNUSED_A5] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A6 [MB_UNUSED_A6] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A7 [MB_UNUSED_A7] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A8 [MB_UNUSED_A8] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A9 [MB_UNUSED_A9] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AA [MB_UNUSED_AA] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AB [MB_UNUSED_AB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AC [MB_UNUSED_AC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AD [MB_UNUSED_AD] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AE [MB_UNUSED_AE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AF [MB_UNUSED_AF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_PC [MB_SECRET_BASE_PC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_REGISTER_PC [MB_SECRET_BASE_REGISTER_PC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_UNUSED [MB_SECRET_BASE_UNUSED] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_BLOCK_DECORATION [MB_BLOCK_DECORATION] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_DECORATION [MB_SECRET_BASE_DECORATION] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_LARGE_MAT_EDGE [MB_SECRET_BASE_LARGE_MAT_EDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_B6 [MB_UNUSED_B6] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_NORTH_WALL [MB_SECRET_BASE_NORTH_WALL] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_BALLOON [MB_SECRET_BASE_BALLOON] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_IMPASSABLE [MB_SECRET_BASE_IMPASSABLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_GLITTER_MAT [MB_SECRET_BASE_GLITTER_MAT] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_JUMP_MAT [MB_SECRET_BASE_JUMP_MAT] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_SPIN_MAT [MB_SECRET_BASE_SPIN_MAT] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_SOUND_MAT [MB_SECRET_BASE_SOUND_MAT] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_BREAKABLE_DOOR [MB_SECRET_BASE_BREAKABLE_DOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SAND_ORNAMENT [MB_SECRET_BASE_SAND_ORNAMENT] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_SOUTH_AND_NORTH [MB_IMPASSABLE_SOUTH_AND_NORTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_WEST_AND_EAST [MB_IMPASSABLE_WEST_AND_EAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_HOLE [MB_SECRET_BASE_HOLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_LARGE_MAT_CENTER [MB_LARGE_MAT_CENTER] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_TV_SHIELD [MB_SECRET_BASE_TV_SHIELD] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_PLAYER_ROOM_PC_ON [MB_PLAYER_ROOM_PC_ON] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_C6 [MB_C6] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_POSTER [MB_SECRET_BASE_POSTER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_C8 [MB_UNUSED_C8] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_C9 [MB_UNUSED_C9] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CA [MB_UNUSED_CA] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CB [MB_UNUSED_CB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CC [MB_UNUSED_CC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CD [MB_UNUSED_CD] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CE [MB_UNUSED_CE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CF [MB_UNUSED_CF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_MUDDY_SLOPE [MB_MUDDY_SLOPE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_BUMPY_SLOPE [MB_BUMPY_SLOPE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_CRACKED_FLOOR [MB_CRACKED_FLOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ISOLATED_VERTICAL_RAIL [MB_ISOLATED_VERTICAL_RAIL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ISOLATED_HORIZONTAL_RAIL [MB_ISOLATED_HORIZONTAL_RAIL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_VERTICAL_RAIL [MB_VERTICAL_RAIL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_HORIZONTAL_RAIL [MB_HORIZONTAL_RAIL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_D7 [MB_UNUSED_D7] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_D8 [MB_UNUSED_D8] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_D9 [MB_UNUSED_D9] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DA [MB_UNUSED_DA] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DB [MB_UNUSED_DB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DC [MB_UNUSED_DC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DD [MB_UNUSED_DD] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DE [MB_UNUSED_DE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DF [MB_UNUSED_DF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_PICTURE_BOOK_SHELF [MB_PICTURE_BOOK_SHELF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_BOOKSHELF [MB_BOOKSHELF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_POKEMON_CENTER_BOOKSHELF [MB_POKEMON_CENTER_BOOKSHELF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_VASE [MB_VASE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_TRASH_CAN [MB_TRASH_CAN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SHOP_SHELF [MB_SHOP_SHELF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_BLUEPRINT [MB_BLUEPRINT] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_CABLE_BOX_RESULTS_2 [MB_CABLE_BOX_RESULTS_2] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_WIRELESS_BOX_RESULTS [MB_WIRELESS_BOX_RESULTS] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_TRAINER_HILL_TIMER [MB_TRAINER_HILL_TIMER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNKNOWN_CLOSED_DOOR [MB_UNKNOWN_CLOSED_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EB [MB_UNUSED_EB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EC [MB_UNUSED_EC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_ED [MB_UNUSED_ED] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EE [MB_UNUSED_EE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EF [MB_UNUSED_EF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
}; };
bool8 MetatileBehavior_IsATile(u8 metatileBehavior) bool8 MetatileBehavior_IsATile(u8 metatileBehavior)

2
src/mossdeep_gym.c
View File

@ -1,7 +1,7 @@
#include "global.h" #include "global.h"
#include "event_object_movement.h" #include "event_object_movement.h"
#include "fieldmap.h" #include "fieldmap.h"
#include "malloc.h" #include "alloc.h"
#include "mossdeep_gym.h" #include "mossdeep_gym.h"
#include "script_movement.h" #include "script_movement.h"
#include "constants/event_object_movement_constants.h" #include "constants/event_object_movement_constants.h"

2
src/naming_screen.c
View File

@ -1,6 +1,6 @@
#include "global.h" #include "global.h"
#include "naming_screen.h" #include "naming_screen.h"
#include "malloc.h" #include "alloc.h"
#include "palette.h" #include "palette.h"
#include "task.h" #include "task.h"
#include "sprite.h" #include "sprite.h"

16
src/new_game.c
View File

@ -205,14 +205,14 @@ void NewGameInitData(void)
ScriptContext2_RunNewScript(EventScript_2715DE); ScriptContext2_RunNewScript(EventScript_2715DE);
ResetMiniGamesResults(); ResetMiniGamesResults();
copy_strings_to_sav1(); copy_strings_to_sav1();
SetLilycoveLady(); SetLilycoveLady();
ResetAllApprenticeData(); ResetAllApprenticeData();
ClearRankingHallRecords(); ClearRankingHallRecords();
sub_8195E10(); sub_8195E10();
sub_801AFD8(); sub_801AFD8();
sub_800E5AC(); sub_800E5AC();
sub_81D54BC(); sub_81D54BC();
ResetContestLinkResults(); ResetContestLinkResults();
} }
static void ResetMiniGamesResults(void) static void ResetMiniGamesResults(void)

56
src/overworld.c
View File

@ -27,7 +27,7 @@
#include "link_rfu.h" #include "link_rfu.h"
#include "load_save.h" #include "load_save.h"
#include "main.h" #include "main.h"
#include "malloc.h" #include "alloc.h"
#include "m4a.h" #include "m4a.h"
#include "map_name_popup.h" #include "map_name_popup.h"
#include "menu.h" #include "menu.h"
@ -296,15 +296,51 @@ static const u8 sUnusedData[] =
const struct UCoords32 gDirectionToVectors[] = const struct UCoords32 gDirectionToVectors[] =
{ {
{ 0, 0}, // DIR_NONE [DIR_NONE] =
{ 0, 1}, // DIR_SOUTH {
{ 0, -1}, // DIR_NORTH .x = 0,
{-1, 0}, // DIR_WEST .y = 0,
{ 1, 0}, // DIR_EAST },
{-1, 1}, // DIR_SOUTHWEST [DIR_SOUTH] =
{ 1, 1}, // DIR_SOUTHEAST {
{-1, -1}, // DIR_NORTHWEST .x = 0,
{ 1, -1}, // DIR_NORTHEAST .y = 1,
},
[DIR_NORTH] =
{
.x = 0,
.y = -1,
},
[DIR_WEST] =
{
.x = -1,
.y = 0,
},
[DIR_EAST] =
{
.x = 1,
.y = 0,
},
[DIR_SOUTHWEST] =
{
.x = -1,
.y = 1,
},
[DIR_SOUTHEAST] =
{
.x = 1,
.y = 1,
},
[DIR_NORTHWEST] =
{
.x = -1,
.y = -1,
},
[DIR_NORTHEAST] =
{
.x = 1,
.y = -1,
},
}; };
static const struct BgTemplate gUnknown_08339DAC[] = static const struct BgTemplate gUnknown_08339DAC[] =

2
src/player_pc.c
View File

@ -15,7 +15,7 @@
#include "list_menu.h" #include "list_menu.h"
#include "mail.h" #include "mail.h"
#include "main.h" #include "main.h"
#include "malloc.h" #include "alloc.h"
#include "menu.h" #include "menu.h"
#include "menu_helpers.h" #include "menu_helpers.h"
#include "overworld.h" #include "overworld.h"

2
src/pokeblock.c
View File

@ -13,7 +13,7 @@
#include "lilycove_lady.h" #include "lilycove_lady.h"
#include "list_menu.h" #include "list_menu.h"
#include "main.h" #include "main.h"
#include "malloc.h" #include "alloc.h"
#include "menu.h" #include "menu.h"
#include "menu_helpers.h" #include "menu_helpers.h"
#include "overworld.h" #include "overworld.h"

52
src/pokeblock_feed.c
View File

@ -7,7 +7,7 @@
#include "gpu_regs.h" #include "gpu_regs.h"
#include "graphics.h" #include "graphics.h"
#include "main.h" #include "main.h"
#include "malloc.h" #include "alloc.h"
#include "menu.h" #include "menu.h"
#include "menu_helpers.h" #include "menu_helpers.h"
#include "m4a.h" #include "m4a.h"
@ -88,31 +88,31 @@ EWRAM_DATA static struct CompressedSpritePalette sPokeblockSpritePal = {0};
// const rom data // const rom data
static const u8 sNatureToMonPokeblockAnim[][2] = static const u8 sNatureToMonPokeblockAnim[][2] =
{ {
{ 0, 0 }, // HARDY [NATURE_HARDY] = { 0, 0 },
{ 3, 0 }, // LONELY [NATURE_LONELY] = { 3, 0 },
{ 4, 1 }, // BRAVE [NATURE_BRAVE] = { 4, 1 },
{ 5, 0 }, // ADAMANT [NATURE_ADAMANT] = { 5, 0 },
{ 10, 0 }, // NAUGHTY [NATURE_NAUGHTY] = { 10, 0 },
{ 13, 0 }, // BOLD [NATURE_BOLD] = { 13, 0 },
{ 15, 0 }, // DOCILE [NATURE_DOCILE] = { 15, 0 },
{ 16, 2 }, // RELAXED [NATURE_RELAXED] = { 16, 2 },
{ 18, 0 }, // IMPISH [NATURE_IMPISH] = { 18, 0 },
{ 19, 0 }, // LAX [NATURE_LAX] = { 19, 0 },
{ 20, 0 }, // TIMID [NATURE_TIMID] = { 20, 0 },
{ 25, 0 }, // HASTY [NATURE_HASTY] = { 25, 0 },
{ 27, 3 }, // SERIOUS [NATURE_SERIOUS] = { 27, 3 },
{ 28, 0 }, // JOLLY [NATURE_JOLLY] = { 28, 0 },
{ 29, 0 }, // NAIVE [NATURE_NAIVE] = { 29, 0 },
{ 33, 4 }, // MODEST [NATURE_MODEST] = { 33, 4 },
{ 36, 0 }, // MILD [NATURE_MILD] = { 36, 0 },
{ 37, 0 }, // QUIET [NATURE_QUIET] = { 37, 0 },
{ 39, 0 }, // BASHFUL [NATURE_BASHFUL] = { 39, 0 },
{ 42, 0 }, // RASH [NATURE_RASH] = { 42, 0 },
{ 45, 0 }, // CALM [NATURE_CALM] = { 45, 0 },
{ 46, 5 }, // GENTLE [NATURE_GENTLE] = { 46, 5 },
{ 47, 6 }, // SASSY [NATURE_SASSY] = { 47, 6 },
{ 48, 0 }, // CAREFUL [NATURE_CAREFUL] = { 48, 0 },
{ 53, 0 }, // QUIRKY [NATURE_QUIRKY] = { 53, 0 },
}; };
static const s16 sMonPokeblockAnims[][10] = static const s16 sMonPokeblockAnims[][10] =

715
src/pokedex.c
View File

@ -8,7 +8,7 @@
#include "graphics.h" #include "graphics.h"
#include "international_string_util.h" #include "international_string_util.h"
#include "main.h" #include "main.h"
#include "malloc.h" #include "alloc.h"
#include "menu.h" #include "menu.h"
#include "m4a.h" #include "m4a.h"
#include "overworld.h" #include "overworld.h"
@ -3577,61 +3577,61 @@ void sub_80BFD0C(u8 a, u16 unused)
{ {
asm(".syntax unified\n\ asm(".syntax unified\n\
push {r4-r7,lr}\n\ push {r4-r7,lr}\n\
mov r7, r8\n\ mov r7, r8\n\
push {r7}\n\ push {r7}\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r0, 24\n\ lsrs r0, 24\n\
mov r8, r0\n\ mov r8, r0\n\
movs r0, 0x1\n\ movs r0, 0x1\n\
bl GetBgTilemapBuffer\n\ bl GetBgTilemapBuffer\n\
adds r7, r0, 0\n\ adds r7, r0, 0\n\
movs r1, 0\n\ movs r1, 0\n\
_080BFD22:\n\ _080BFD22:\n\
lsls r0, r1, 3\n\ lsls r0, r1, 3\n\
subs r0, r1\n\ subs r0, r1\n\
adds r0, 0x1\n\ adds r0, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r5, r0, 24\n\ lsrs r5, r0, 24\n\
movs r3, 0x80\n\ movs r3, 0x80\n\
lsls r3, 7\n\ lsls r3, 7\n\
cmp r1, r8\n\ cmp r1, r8\n\
bne _080BFD38\n\ bne _080BFD38\n\
movs r3, 0x80\n\ movs r3, 0x80\n\
lsls r3, 6\n\ lsls r3, 6\n\
_080BFD38:\n\ _080BFD38:\n\
movs r2, 0\n\ movs r2, 0\n\
adds r6, r1, 0x1\n\ adds r6, r1, 0x1\n\
ldr r4, =0x00000fff\n\ ldr r4, =0x00000fff\n\
_080BFD3E:\n\ _080BFD3E:\n\
adds r1, r5, r2\n\ adds r1, r5, r2\n\
lsls r1, 1\n\ lsls r1, 1\n\
adds r1, r7\n\ adds r1, r7\n\
ldrh r0, [r1]\n\ ldrh r0, [r1]\n\
ands r0, r4\n\ ands r0, r4\n\
orrs r0, r3\n\ orrs r0, r3\n\
strh r0, [r1]\n\ strh r0, [r1]\n\
adds r1, 0x40\n\ adds r1, 0x40\n\
ldrh r0, [r1]\n\ ldrh r0, [r1]\n\
ands r0, r4\n\ ands r0, r4\n\
orrs r0, r3\n\ orrs r0, r3\n\
strh r0, [r1]\n\ strh r0, [r1]\n\
adds r0, r2, 0x1\n\ adds r0, r2, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r2, r0, 24\n\ lsrs r2, r0, 24\n\
cmp r2, 0x6\n\ cmp r2, 0x6\n\
bls _080BFD3E\n\ bls _080BFD3E\n\
lsls r0, r6, 24\n\ lsls r0, r6, 24\n\
lsrs r1, r0, 24\n\ lsrs r1, r0, 24\n\
cmp r1, 0x3\n\ cmp r1, 0x3\n\
bls _080BFD22\n\ bls _080BFD22\n\
movs r0, 0x1\n\ movs r0, 0x1\n\
bl CopyBgTilemapBufferToVram\n\ bl CopyBgTilemapBufferToVram\n\
pop {r3}\n\ pop {r3}\n\
mov r8, r3\n\ mov r8, r3\n\
pop {r4-r7}\n\ pop {r4-r7}\n\
pop {r0}\n\ pop {r0}\n\
bx r0\n\ bx r0\n\
.pool\n\ .pool\n\
.syntax divided\n"); .syntax divided\n");
} }
#endif #endif
@ -3667,66 +3667,66 @@ void sub_80BFD7C(u8 a, u16 b)
{ {
asm(".syntax unified\n\ asm(".syntax unified\n\
push {r4-r7,lr}\n\ push {r4-r7,lr}\n\
mov r7, r8\n\ mov r7, r8\n\
push {r7}\n\ push {r7}\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r0, 24\n\ lsrs r0, 24\n\
mov r8, r0\n\ mov r8, r0\n\
movs r0, 0x1\n\ movs r0, 0x1\n\
bl GetBgTilemapBuffer\n\ bl GetBgTilemapBuffer\n\
adds r7, r0, 0\n\ adds r7, r0, 0\n\
movs r1, 0\n\ movs r1, 0\n\
_080BFD92:\n\ _080BFD92:\n\
lsls r0, r1, 3\n\ lsls r0, r1, 3\n\
subs r0, r1\n\ subs r0, r1\n\
adds r0, 0x1\n\ adds r0, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r6, r0, 24\n\ lsrs r6, r0, 24\n\
cmp r1, r8\n\ cmp r1, r8\n\
beq _080BFDA4\n\ beq _080BFDA4\n\
cmp r1, 0x3\n\ cmp r1, 0x3\n\
bne _080BFDAA\n\ bne _080BFDAA\n\
_080BFDA4:\n\ _080BFDA4:\n\
movs r3, 0x80\n\ movs r3, 0x80\n\
lsls r3, 6\n\ lsls r3, 6\n\
b _080BFDAE\n\ b _080BFDAE\n\
_080BFDAA:\n\ _080BFDAA:\n\
movs r3, 0x80\n\ movs r3, 0x80\n\
lsls r3, 7\n\ lsls r3, 7\n\
_080BFDAE:\n\ _080BFDAE:\n\
movs r2, 0\n\ movs r2, 0\n\
adds r5, r1, 0x1\n\ adds r5, r1, 0x1\n\
ldr r4, =0x00000fff\n\ ldr r4, =0x00000fff\n\
_080BFDB4:\n\ _080BFDB4:\n\
adds r1, r6, r2\n\ adds r1, r6, r2\n\
lsls r1, 1\n\ lsls r1, 1\n\
adds r1, r7\n\ adds r1, r7\n\
ldrh r0, [r1]\n\ ldrh r0, [r1]\n\
ands r0, r4\n\ ands r0, r4\n\
orrs r0, r3\n\ orrs r0, r3\n\
strh r0, [r1]\n\ strh r0, [r1]\n\
adds r1, 0x40\n\ adds r1, 0x40\n\
ldrh r0, [r1]\n\ ldrh r0, [r1]\n\
ands r0, r4\n\ ands r0, r4\n\
orrs r0, r3\n\ orrs r0, r3\n\
strh r0, [r1]\n\ strh r0, [r1]\n\
adds r0, r2, 0x1\n\ adds r0, r2, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r2, r0, 24\n\ lsrs r2, r0, 24\n\
cmp r2, 0x6\n\ cmp r2, 0x6\n\
bls _080BFDB4\n\ bls _080BFDB4\n\
lsls r0, r5, 24\n\ lsls r0, r5, 24\n\
lsrs r1, r0, 24\n\ lsrs r1, r0, 24\n\
cmp r1, 0x3\n\ cmp r1, 0x3\n\
bls _080BFD92\n\ bls _080BFD92\n\
movs r0, 0x1\n\ movs r0, 0x1\n\
bl CopyBgTilemapBufferToVram\n\ bl CopyBgTilemapBufferToVram\n\
pop {r3}\n\ pop {r3}\n\
mov r8, r3\n\ mov r8, r3\n\
pop {r4-r7}\n\ pop {r4-r7}\n\
pop {r0}\n\ pop {r0}\n\
bx r0\n\ bx r0\n\
.pool\n\ .pool\n\
.syntax divided\n"); .syntax divided\n");
} }
#endif #endif
@ -4031,216 +4031,216 @@ void sub_80C0460(u16 weight, u8 left, u8 top)
{ {
asm(".syntax unified\n\ asm(".syntax unified\n\
push {r4-r7,lr}\n\ push {r4-r7,lr}\n\
mov r7, r10\n\ mov r7, r10\n\
mov r6, r9\n\ mov r6, r9\n\
mov r5, r8\n\ mov r5, r8\n\
push {r5-r7}\n\ push {r5-r7}\n\
sub sp, 0x14\n\ sub sp, 0x14\n\
lsls r0, 16\n\ lsls r0, 16\n\
lsrs r0, 16\n\ lsrs r0, 16\n\
lsls r1, 24\n\ lsls r1, 24\n\
lsrs r1, 24\n\ lsrs r1, 24\n\
mov r10, r1\n\ mov r10, r1\n\
lsls r2, 24\n\ lsls r2, 24\n\
lsrs r2, 24\n\ lsrs r2, 24\n\
str r2, [sp, 0x10]\n\ str r2, [sp, 0x10]\n\
ldr r5, =0x000186a0\n\ ldr r5, =0x000186a0\n\
muls r0, r5\n\ muls r0, r5\n\
ldr r1, =0x000011b8\n\ ldr r1, =0x000011b8\n\
bl __divsi3\n\ bl __divsi3\n\
adds r7, r0, 0\n\ adds r7, r0, 0\n\
movs r1, 0xA\n\ movs r1, 0xA\n\
bl __umodsi3\n\ bl __umodsi3\n\
cmp r0, 0x4\n\ cmp r0, 0x4\n\
bls _080C0494\n\ bls _080C0494\n\
adds r7, 0xA\n\ adds r7, 0xA\n\
_080C0494:\n\ _080C0494:\n\
movs r0, 0\n\ movs r0, 0\n\
mov r8, r0\n\ mov r8, r0\n\
mov r4, sp\n\ mov r4, sp\n\
adds r0, r7, 0\n\ adds r0, r7, 0\n\
adds r1, r5, 0\n\ adds r1, r5, 0\n\
bl __udivsi3\n\ bl __udivsi3\n\
adds r0, 0xA1\n\ adds r0, 0xA1\n\
strb r0, [r4]\n\ strb r0, [r4]\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r0, 24\n\ lsrs r0, 24\n\
cmp r0, 0xA1\n\ cmp r0, 0xA1\n\
bne _080C04C0\n\ bne _080C04C0\n\
movs r6, 0x1\n\ movs r6, 0x1\n\
mov r1, sp\n\ mov r1, sp\n\
movs r0, 0x77\n\ movs r0, 0x77\n\
strb r0, [r1]\n\ strb r0, [r1]\n\
b _080C04C6\n\ b _080C04C6\n\
.pool\n\ .pool\n\
_080C04C0:\n\ _080C04C0:\n\
movs r1, 0x1\n\ movs r1, 0x1\n\
mov r8, r1\n\ mov r8, r1\n\
movs r6, 0x1\n\ movs r6, 0x1\n\
_080C04C6:\n\ _080C04C6:\n\
ldr r1, =0x000186a0\n\ ldr r1, =0x000186a0\n\
adds r0, r7, 0\n\ adds r0, r7, 0\n\
bl __umodsi3\n\ bl __umodsi3\n\
adds r7, r0, 0\n\ adds r7, r0, 0\n\
mov r4, sp\n\ mov r4, sp\n\
adds r4, 0x1\n\ adds r4, 0x1\n\
ldr r1, =0x00002710\n\ ldr r1, =0x00002710\n\
bl __udivsi3\n\ bl __udivsi3\n\
adds r0, 0xA1\n\ adds r0, 0xA1\n\
strb r0, [r4]\n\ strb r0, [r4]\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r0, 24\n\ lsrs r0, 24\n\
cmp r0, 0xA1\n\ cmp r0, 0xA1\n\
bne _080C0504\n\ bne _080C0504\n\
mov r2, r8\n\ mov r2, r8\n\
cmp r2, 0\n\ cmp r2, 0\n\
bne _080C0504\n\ bne _080C0504\n\
adds r1, r6, 0\n\ adds r1, r6, 0\n\
adds r0, r1, 0x1\n\ adds r0, r1, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r6, r0, 24\n\ lsrs r6, r0, 24\n\
add r1, sp\n\ add r1, sp\n\
movs r0, 0x77\n\ movs r0, 0x77\n\
strb r0, [r1]\n\ strb r0, [r1]\n\
b _080C050E\n\ b _080C050E\n\
.pool\n\ .pool\n\
_080C0504:\n\ _080C0504:\n\
movs r3, 0x1\n\ movs r3, 0x1\n\
mov r8, r3\n\ mov r8, r3\n\
adds r0, r6, 0x1\n\ adds r0, r6, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r6, r0, 24\n\ lsrs r6, r0, 24\n\
_080C050E:\n\ _080C050E:\n\
ldr r1, =0x00002710\n\ ldr r1, =0x00002710\n\
adds r0, r7, 0\n\ adds r0, r7, 0\n\
bl __umodsi3\n\ bl __umodsi3\n\
adds r7, r0, 0\n\ adds r7, r0, 0\n\
mov r0, sp\n\ mov r0, sp\n\
adds r4, r0, r6\n\ adds r4, r0, r6\n\
movs r1, 0xFA\n\ movs r1, 0xFA\n\
lsls r1, 2\n\ lsls r1, 2\n\
adds r0, r7, 0\n\ adds r0, r7, 0\n\
bl __udivsi3\n\ bl __udivsi3\n\
adds r0, 0xA1\n\ adds r0, 0xA1\n\
strb r0, [r4]\n\ strb r0, [r4]\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r0, 24\n\ lsrs r0, 24\n\
cmp r0, 0xA1\n\ cmp r0, 0xA1\n\
bne _080C054C\n\ bne _080C054C\n\
mov r1, r8\n\ mov r1, r8\n\
cmp r1, 0\n\ cmp r1, 0\n\
bne _080C054C\n\ bne _080C054C\n\
adds r1, r6, 0\n\ adds r1, r6, 0\n\
adds r0, r1, 0x1\n\ adds r0, r1, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r6, r0, 24\n\ lsrs r6, r0, 24\n\
add r1, sp\n\ add r1, sp\n\
movs r0, 0x77\n\ movs r0, 0x77\n\
strb r0, [r1]\n\ strb r0, [r1]\n\
b _080C0552\n\ b _080C0552\n\
.pool\n\ .pool\n\
_080C054C:\n\ _080C054C:\n\
adds r0, r6, 0x1\n\ adds r0, r6, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r6, r0, 24\n\ lsrs r6, r0, 24\n\
_080C0552:\n\ _080C0552:\n\
movs r1, 0xFA\n\ movs r1, 0xFA\n\
lsls r1, 2\n\ lsls r1, 2\n\
adds r0, r7, 0\n\ adds r0, r7, 0\n\
bl __umodsi3\n\ bl __umodsi3\n\
adds r7, r0, 0\n\ adds r7, r0, 0\n\
adds r1, r6, 0\n\ adds r1, r6, 0\n\
adds r0, r1, 0x1\n\ adds r0, r1, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r6, r0, 24\n\ lsrs r6, r0, 24\n\
adds r5, r6, 0\n\ adds r5, r6, 0\n\
mov r2, sp\n\ mov r2, sp\n\
adds r4, r2, r1\n\ adds r4, r2, r1\n\
adds r0, r7, 0\n\ adds r0, r7, 0\n\
movs r1, 0x64\n\ movs r1, 0x64\n\
bl __udivsi3\n\ bl __udivsi3\n\
adds r0, 0xA1\n\ adds r0, 0xA1\n\
movs r3, 0\n\ movs r3, 0\n\
mov r9, r3\n\ mov r9, r3\n\
strb r0, [r4]\n\ strb r0, [r4]\n\
adds r0, r7, 0\n\ adds r0, r7, 0\n\
movs r1, 0x64\n\ movs r1, 0x64\n\
bl __umodsi3\n\ bl __umodsi3\n\
adds r7, r0, 0\n\ adds r7, r0, 0\n\
adds r0, r5, 0x1\n\ adds r0, r5, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r6, r0, 24\n\ lsrs r6, r0, 24\n\
adds r1, r6, 0\n\ adds r1, r6, 0\n\
mov r2, sp\n\ mov r2, sp\n\
adds r0, r2, r5\n\ adds r0, r2, r5\n\
movs r3, 0xAD\n\ movs r3, 0xAD\n\
mov r8, r3\n\ mov r8, r3\n\
mov r2, r8\n\ mov r2, r8\n\
strb r2, [r0]\n\ strb r2, [r0]\n\
adds r0, r1, 0x1\n\ adds r0, r1, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r6, r0, 24\n\ lsrs r6, r0, 24\n\
adds r5, r6, 0\n\ adds r5, r6, 0\n\
mov r3, sp\n\ mov r3, sp\n\
adds r4, r3, r1\n\ adds r4, r3, r1\n\
adds r0, r7, 0\n\ adds r0, r7, 0\n\
movs r1, 0xA\n\ movs r1, 0xA\n\
bl __udivsi3\n\ bl __udivsi3\n\
adds r0, 0xA1\n\ adds r0, 0xA1\n\
strb r0, [r4]\n\ strb r0, [r4]\n\
adds r0, r5, 0x1\n\ adds r0, r5, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r6, r0, 24\n\ lsrs r6, r0, 24\n\
adds r1, r6, 0\n\ adds r1, r6, 0\n\
mov r2, sp\n\ mov r2, sp\n\
adds r0, r2, r5\n\ adds r0, r2, r5\n\
mov r3, r9\n\ mov r3, r9\n\
strb r3, [r0]\n\ strb r3, [r0]\n\
adds r0, r1, 0x1\n\ adds r0, r1, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r6, r0, 24\n\ lsrs r6, r0, 24\n\
adds r2, r6, 0\n\ adds r2, r6, 0\n\
add r1, sp\n\ add r1, sp\n\
movs r0, 0xE0\n\ movs r0, 0xE0\n\
strb r0, [r1]\n\ strb r0, [r1]\n\
adds r0, r2, 0x1\n\ adds r0, r2, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r6, r0, 24\n\ lsrs r6, r0, 24\n\
adds r3, r6, 0\n\ adds r3, r6, 0\n\
mov r0, sp\n\ mov r0, sp\n\
adds r1, r0, r2\n\ adds r1, r0, r2\n\
movs r0, 0xD6\n\ movs r0, 0xD6\n\
strb r0, [r1]\n\ strb r0, [r1]\n\
adds r0, r3, 0x1\n\ adds r0, r3, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r6, r0, 24\n\ lsrs r6, r0, 24\n\
adds r2, r6, 0\n\ adds r2, r6, 0\n\
mov r0, sp\n\ mov r0, sp\n\
adds r1, r0, r3\n\ adds r1, r0, r3\n\
movs r0, 0xE7\n\ movs r0, 0xE7\n\
strb r0, [r1]\n\ strb r0, [r1]\n\
adds r0, r2, 0x1\n\ adds r0, r2, 0x1\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r0, 24\n\ lsrs r0, 24\n\
mov r3, sp\n\ mov r3, sp\n\
adds r1, r3, r2\n\ adds r1, r3, r2\n\
mov r2, r8\n\ mov r2, r8\n\
strb r2, [r1]\n\ strb r2, [r1]\n\
adds r1, r3, r0\n\ adds r1, r3, r0\n\
movs r0, 0xFF\n\ movs r0, 0xFF\n\
strb r0, [r1]\n\ strb r0, [r1]\n\
mov r0, sp\n\ mov r0, sp\n\
mov r1, r10\n\ mov r1, r10\n\
ldr r2, [sp, 0x10]\n\ ldr r2, [sp, 0x10]\n\
bl sub_80BE8DC\n\ bl sub_80BE8DC\n\
add sp, 0x14\n\ add sp, 0x14\n\
pop {r3-r5}\n\ pop {r3-r5}\n\
mov r8, r3\n\ mov r8, r3\n\
mov r9, r4\n\ mov r9, r4\n\
mov r10, r5\n\ mov r10, r5\n\
pop {r4-r7}\n\ pop {r4-r7}\n\
pop {r0}\n\ pop {r0}\n\
bx r0\n\ bx r0\n\
.syntax divided\n"); .syntax divided\n");
} }
#endif #endif
@ -4763,7 +4763,6 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8
sPokedexView->pokedexList[i].dexNum = 0xFFFF; sPokedexView->pokedexList[i].dexNum = 0xFFFF;
sPokedexView->pokedexList[i].seen = FALSE; sPokedexView->pokedexList[i].seen = FALSE;
sPokedexView->pokedexList[i].owned = FALSE; sPokedexView->pokedexList[i].owned = FALSE;
} }
} }
@ -5234,54 +5233,54 @@ void sub_80C1D98(u8 a, u8 b, u8 c, u8 d)
{ {
asm(".syntax unified\n\ asm(".syntax unified\n\
push {r4-r7,lr}\n\ push {r4-r7,lr}\n\
mov r7, r8\n\ mov r7, r8\n\
push {r7}\n\ push {r7}\n\
adds r4, r3, 0\n\ adds r4, r3, 0\n\
lsls r0, 24\n\ lsls r0, 24\n\
lsrs r6, r0, 24\n\ lsrs r6, r0, 24\n\
lsls r1, 24\n\ lsls r1, 24\n\
lsrs r1, 24\n\ lsrs r1, 24\n\
mov r8, r1\n\ mov r8, r1\n\
lsls r2, 24\n\ lsls r2, 24\n\
lsrs r5, r2, 24\n\ lsrs r5, r2, 24\n\
lsls r4, 24\n\ lsls r4, 24\n\
lsrs r4, 24\n\ lsrs r4, 24\n\
movs r0, 0x3\n\ movs r0, 0x3\n\
bl GetBgTilemapBuffer\n\ bl GetBgTilemapBuffer\n\
adds r2, r0, 0\n\ adds r2, r0, 0\n\
movs r3, 0\n\ movs r3, 0\n\
cmp r3, r4\n\ cmp r3, r4\n\
bcs _080C1DEC\n\ bcs _080C1DEC\n\
lsls r0, r5, 6\n\ lsls r0, r5, 6\n\
adds r7, r0, r2\n\ adds r7, r0, r2\n\
ldr r5, =0x00000fff\n\ ldr r5, =0x00000fff\n\
lsls r2, r6, 12\n\ lsls r2, r6, 12\n\
_080C1DC8:\n\ _080C1DC8:\n\
mov r0, r8\n\ mov r0, r8\n\
adds r1, r0, r3\n\ adds r1, r0, r3\n\
lsls r1, 1\n\ lsls r1, 1\n\
adds r1, r7\n\ adds r1, r7\n\
ldrh r0, [r1]\n\ ldrh r0, [r1]\n\
ands r0, r5\n\ ands r0, r5\n\
orrs r0, r2\n\ orrs r0, r2\n\
strh r0, [r1]\n\ strh r0, [r1]\n\
adds r1, 0x40\n\ adds r1, 0x40\n\
ldrh r0, [r1]\n\ ldrh r0, [r1]\n\
ands r0, r5\n\ ands r0, r5\n\
orrs r0, r2\n\ orrs r0, r2\n\
strh r0, [r1]\n\ strh r0, [r1]\n\
adds r0, r3, 0x1\n\ adds r0, r3, 0x1\n\
lsls r0, 16\n\ lsls r0, 16\n\
lsrs r3, r0, 16\n\ lsrs r3, r0, 16\n\
cmp r3, r4\n\ cmp r3, r4\n\
bcc _080C1DC8\n\ bcc _080C1DC8\n\
_080C1DEC:\n\ _080C1DEC:\n\
pop {r3}\n\ pop {r3}\n\
mov r8, r3\n\ mov r8, r3\n\
pop {r4-r7}\n\ pop {r4-r7}\n\
pop {r0}\n\ pop {r0}\n\
bx r0\n\ bx r0\n\
.pool\n\ .pool\n\
.syntax divided\n"); .syntax divided\n");
} }
#endif #endif

2
src/pokedex_area_screen.c
View File

@ -4,7 +4,7 @@
#include "gpu_regs.h" #include "gpu_regs.h"
#include "graphics.h" #include "graphics.h"
#include "main.h" #include "main.h"
#include "malloc.h" #include "alloc.h"
#include "menu.h" #include "menu.h"
#include "overworld.h" #include "overworld.h"
#include "palette.h" #include "palette.h"

2
src/pokedex_cry_screen.c
View File

@ -2,7 +2,7 @@
#include "bg.h" #include "bg.h"
#include "m4a.h" #include "m4a.h"
#include "main.h" #include "main.h"
#include "malloc.h" #include "alloc.h"
#include "palette.h" #include "palette.h"
#include "pokedex_cry_screen.h" #include "pokedex_cry_screen.h"
#include "sound.h" #include "sound.h"

1666
src/pokemon.c
View File

File diff suppressed because it is too large Load Diff

160
src/pokemon_animation.c
View File

@ -786,31 +786,31 @@ static const u8 sBackAnimationIds[] =
static const u8 sBackAnimNatureModTable[] = static const u8 sBackAnimNatureModTable[] =
{ {
0x00, // NATURE_HARDY [NATURE_HARDY] = 0x00,
0x02, // NATURE_LONELY [NATURE_LONELY] = 0x02,
0x00, // NATURE_BRAVE [NATURE_BRAVE] = 0x00,
0x00, // NATURE_ADAMANT [NATURE_ADAMANT] = 0x00,
0x00, // NATURE_NAUGHTY [NATURE_NAUGHTY] = 0x00,
0x01, // NATURE_BOLD [NATURE_BOLD] = 0x01,
0x01, // NATURE_DOCILE [NATURE_DOCILE] = 0x01,
0x01, // NATURE_RELAXED [NATURE_RELAXED] = 0x01,
0x00, // NATURE_IMPISH [NATURE_IMPISH] = 0x00,
0x01, // NATURE_LAX [NATURE_LAX] = 0x01,
0x02, // NATURE_TIMID [NATURE_TIMID] = 0x02,
0x00, // NATURE_HASTY [NATURE_HASTY] = 0x00,
0x01, // NATURE_SERIOUS [NATURE_SERIOUS] = 0x01,
0x00, // NATURE_JOLLY [NATURE_JOLLY] = 0x00,
0x00, // NATURE_NAIVE [NATURE_NAIVE] = 0x00,
0x02, // NATURE_MODEST [NATURE_MODEST] = 0x02,
0x02, // NATURE_MILD [NATURE_MILD] = 0x02,
0x02, // NATURE_QUIET [NATURE_QUIET] = 0x02,
0x02, // NATURE_BASHFUL [NATURE_BASHFUL] = 0x02,
0x01, // NATURE_RASH [NATURE_RASH] = 0x01,
0x01, // NATURE_CALM [NATURE_CALM] = 0x01,
0x02, // NATURE_GENTLE [NATURE_GENTLE] = 0x02,
0x01, // NATURE_SASSY [NATURE_SASSY] = 0x01,
0x02, // NATURE_CAREFUL [NATURE_CAREFUL] = 0x02,
0x01, // NATURE_QUIRKY [NATURE_QUIRKY] = 0x01,
}; };
static const union AffineAnimCmd sSpriteAffineAnim_860AD48[] = static const union AffineAnimCmd sSpriteAffineAnim_860AD48[] =
@ -1164,67 +1164,67 @@ NAKED
static void sub_817F9F4(struct Sprite *sprite) static void sub_817F9F4(struct Sprite *sprite)
{ {
asm(".syntax unified\n\ asm(".syntax unified\n\
push {r4,lr}\n\ push {r4,lr}\n\
adds r4, r0, 0\n\ adds r4, r0, 0\n\
movs r0, 0x32\n\ movs r0, 0x32\n\
ldrsh r1, [r4, r0]\n\ ldrsh r1, [r4, r0]\n\
movs r0, 0xC0\n\ movs r0, 0xC0\n\
lsls r0, 1\n\ lsls r0, 1\n\
cmp r1, r0\n\ cmp r1, r0\n\
ble _0817FA14\n\ ble _0817FA14\n\
ldr r0, =SpriteCB_SetDummyOnAnimEnd\n\ ldr r0, =SpriteCB_SetDummyOnAnimEnd\n\
str r0, [r4, 0x1C]\n\ str r0, [r4, 0x1C]\n\
movs r0, 0\n\ movs r0, 0\n\
strh r0, [r4, 0x24]\n\ strh r0, [r4, 0x24]\n\
b _0817FA5E\n\ b _0817FA5E\n\
.pool\n\ .pool\n\
_0817FA14:\n\ _0817FA14:\n\
adds r0, r1, 0\n\ adds r0, r1, 0\n\
cmp r1, 0\n\ cmp r1, 0\n\
bge _0817FA1C\n\ bge _0817FA1C\n\
adds r0, 0x7F\n\ adds r0, 0x7F\n\
_0817FA1C:\n\ _0817FA1C:\n\
asrs r2, r0, 7\n\ asrs r2, r0, 7\n\
lsls r0, r2, 16\n\ lsls r0, r2, 16\n\
asrs r0, 16\n\ asrs r0, 16\n\
cmp r0, 0\n\ cmp r0, 0\n\
blt _0817FA60\n\ blt _0817FA60\n\
cmp r0, 0x1\n\ cmp r0, 0x1\n\
ble _0817FA48\n\ ble _0817FA48\n\
cmp r0, 0x3\n\ cmp r0, 0x3\n\
bgt _0817FA60\n\ bgt _0817FA60\n\
ldr r2, =0xffffff00\n\ ldr r2, =0xffffff00\n\
adds r1, r2\n\ adds r1, r2\n\
lsls r0, r1, 16\n\ lsls r0, r1, 16\n\
asrs r0, 16\n\ asrs r0, 16\n\
movs r1, 0x2E\n\ movs r1, 0x2E\n\
ldrsh r2, [r4, r1]\n\ ldrsh r2, [r4, r1]\n\
lsls r1, r2, 1\n\ lsls r1, r2, 1\n\
adds r1, r2\n\ adds r1, r2\n\
lsls r1, 16\n\ lsls r1, 16\n\
b _0817FA56\n\ b _0817FA56\n\
.pool\n\ .pool\n\
_0817FA48:\n\ _0817FA48:\n\
lsls r0, r2, 7\n\ lsls r0, r2, 7\n\
subs r0, r1, r0\n\ subs r0, r1, r0\n\
lsls r0, 16\n\ lsls r0, 16\n\
asrs r0, 16\n\ asrs r0, 16\n\
movs r2, 0x2E\n\ movs r2, 0x2E\n\
ldrsh r1, [r4, r2]\n\ ldrsh r1, [r4, r2]\n\
lsls r1, 17\n\ lsls r1, 17\n\
_0817FA56:\n\ _0817FA56:\n\
asrs r1, 16\n\ asrs r1, 16\n\
bl Sin\n\ bl Sin\n\
negs r0, r0\n\ negs r0, r0\n\
_0817FA5E:\n\ _0817FA5E:\n\
strh r0, [r4, 0x26]\n\ strh r0, [r4, 0x26]\n\
_0817FA60:\n\ _0817FA60:\n\
ldrh r0, [r4, 0x32]\n\ ldrh r0, [r4, 0x32]\n\
adds r0, 0xC\n\ adds r0, 0xC\n\
strh r0, [r4, 0x32]\n\ strh r0, [r4, 0x32]\n\
pop {r4}\n\ pop {r4}\n\
pop {r0}\n\ pop {r0}\n\
bx r0\n\ bx r0\n\
.syntax divided"); .syntax divided");
} }

882
src/pokemon_icon.c
View File

@ -469,446 +469,446 @@ const u8 *const gMonIconTable[] =
const u8 gMonIconPaletteIndices[] = const u8 gMonIconPaletteIndices[] =
{ {
0, // ?????????? [SPECIES_NONE] = 0,
1, // Bulbasaur [SPECIES_BULBASAUR] = 1,
1, // Ivysaur [SPECIES_IVYSAUR] = 1,
1, // Venusaur [SPECIES_VENUSAUR] = 1,
0, // Charmander [SPECIES_CHARMANDER] = 0,
0, // Charmeleon [SPECIES_CHARMELEON] = 0,
0, // Charizard [SPECIES_CHARIZARD] = 0,
0, // Squirtle [SPECIES_SQUIRTLE] = 0,
2, // Wartortle [SPECIES_WARTORTLE] = 2,
2, // Blastoise [SPECIES_BLASTOISE] = 2,
1, // Caterpie [SPECIES_CATERPIE] = 1,
1, // Metapod [SPECIES_METAPOD] = 1,
0, // Butterfree [SPECIES_BUTTERFREE] = 0,
1, // Weedle [SPECIES_WEEDLE] = 1,
2, // Kakuna [SPECIES_KAKUNA] = 2,
2, // Beedrill [SPECIES_BEEDRILL] = 2,
0, // Pidgey [SPECIES_PIDGEY] = 0,
0, // Pidgeotto [SPECIES_PIDGEOTTO] = 0,
0, // Pidgeot [SPECIES_PIDGEOT] = 0,
2, // Rattata [SPECIES_RATTATA] = 2,
1, // Raticate [SPECIES_RATICATE] = 1,
0, // Spearow [SPECIES_SPEAROW] = 0,
0, // Fearow [SPECIES_FEAROW] = 0,
2, // Ekans [SPECIES_EKANS] = 2,
2, // Arbok [SPECIES_ARBOK] = 2,
2, // Pikachu [SPECIES_PIKACHU] = 2,
0, // Raichu [SPECIES_RAICHU] = 0,
2, // Sandshrew [SPECIES_SANDSHREW] = 2,
2, // Sandslash [SPECIES_SANDSLASH] = 2,
2, // Nidoran♀ [SPECIES_NIDORAN_F] = 2,
2, // Nidorina [SPECIES_NIDORINA] = 2,
2, // Nidoqueen [SPECIES_NIDOQUEEN] = 2,
2, // Nidoran♂ [SPECIES_NIDORAN_M] = 2,
2, // Nidorino [SPECIES_NIDORINO] = 2,
2, // Nidoking [SPECIES_NIDOKING] = 2,
0, // Clefairy [SPECIES_CLEFAIRY] = 0,
0, // Clefable [SPECIES_CLEFABLE] = 0,
2, // Vulpix [SPECIES_VULPIX] = 2,
1, // Ninetales [SPECIES_NINETALES] = 1,
0, // Jigglypuff [SPECIES_JIGGLYPUFF] = 0,
0, // Wigglytuff [SPECIES_WIGGLYTUFF] = 0,
2, // Zubat [SPECIES_ZUBAT] = 2,
2, // Golbat [SPECIES_GOLBAT] = 2,
1, // Oddish [SPECIES_ODDISH] = 1,
0, // Gloom [SPECIES_GLOOM] = 0,
0, // Vileplume [SPECIES_VILEPLUME] = 0,
0, // Paras [SPECIES_PARAS] = 0,
0, // Parasect [SPECIES_PARASECT] = 0,
0, // Venonat [SPECIES_VENONAT] = 0,
2, // Venomoth [SPECIES_VENOMOTH] = 2,
2, // Diglett [SPECIES_DIGLETT] = 2,
2, // Dugtrio [SPECIES_DUGTRIO] = 2,
1, // Meowth [SPECIES_MEOWTH] = 1,
1, // Persian [SPECIES_PERSIAN] = 1,
1, // Psyduck [SPECIES_PSYDUCK] = 1,
2, // Golduck [SPECIES_GOLDUCK] = 2,
1, // Mankey [SPECIES_MANKEY] = 1,
2, // Primeape [SPECIES_PRIMEAPE] = 2,
0, // Growlithe [SPECIES_GROWLITHE] = 0,
0, // Arcanine [SPECIES_ARCANINE] = 0,
0, // Poliwag [SPECIES_POLIWAG] = 0,
0, // Poliwhirl [SPECIES_POLIWHIRL] = 0,
0, // Poliwrath [SPECIES_POLIWRATH] = 0,
2, // Abra [SPECIES_ABRA] = 2,
2, // Kadabra [SPECIES_KADABRA] = 2,
2, // Alakazam [SPECIES_ALAKAZAM] = 2,
0, // Machop [SPECIES_MACHOP] = 0,
2, // Machoke [SPECIES_MACHOKE] = 2,
0, // Machamp [SPECIES_MACHAMP] = 0,
1, // Bellsprout [SPECIES_BELLSPROUT] = 1,
1, // Weepinbell [SPECIES_WEEPINBELL] = 1,
1, // Victreebel [SPECIES_VICTREEBEL] = 1,
2, // Tentacool [SPECIES_TENTACOOL] = 2,
2, // Tentacruel [SPECIES_TENTACRUEL] = 2,
1, // Geodude [SPECIES_GEODUDE] = 1,
1, // Graveler [SPECIES_GRAVELER] = 1,
1, // Golem [SPECIES_GOLEM] = 1,
0, // Ponyta [SPECIES_PONYTA] = 0,
0, // Rapidash [SPECIES_RAPIDASH] = 0,
0, // Slowpoke [SPECIES_SLOWPOKE] = 0,
0, // Slowbro [SPECIES_SLOWBRO] = 0,
0, // Magnemite [SPECIES_MAGNEMITE] = 0,
0, // Magneton [SPECIES_MAGNETON] = 0,
1, // Farfetch'd [SPECIES_FARFETCHD] = 1,
2, // Doduo [SPECIES_DODUO] = 2,
2, // Dodrio [SPECIES_DODRIO] = 2,
2, // Seel [SPECIES_SEEL] = 2,
2, // Dewgong [SPECIES_DEWGONG] = 2,
2, // Grimer [SPECIES_GRIMER] = 2,
2, // Muk [SPECIES_MUK] = 2,
2, // Shellder [SPECIES_SHELLDER] = 2,
2, // Cloyster [SPECIES_CLOYSTER] = 2,
2, // Gastly [SPECIES_GASTLY] = 2,
2, // Haunter [SPECIES_HAUNTER] = 2,
2, // Gengar [SPECIES_GENGAR] = 2,
2, // Onix [SPECIES_ONIX] = 2,
2, // Drowzee [SPECIES_DROWZEE] = 2,
1, // Hypno [SPECIES_HYPNO] = 1,
2, // Krabby [SPECIES_KRABBY] = 2,
2, // Kingler [SPECIES_KINGLER] = 2,
0, // Voltorb [SPECIES_VOLTORB] = 0,
0, // Electrode [SPECIES_ELECTRODE] = 0,
0, // Exeggcute [SPECIES_EXEGGCUTE] = 0,
1, // Exeggutor [SPECIES_EXEGGUTOR] = 1,
1, // Cubone [SPECIES_CUBONE] = 1,
1, // Marowak [SPECIES_MAROWAK] = 1,
2, // Hitmonlee [SPECIES_HITMONLEE] = 2,
2, // Hitmonchan [SPECIES_HITMONCHAN] = 2,
1, // Lickitung [SPECIES_LICKITUNG] = 1,
2, // Koffing [SPECIES_KOFFING] = 2,
2, // Weezing [SPECIES_WEEZING] = 2,
1, // Rhyhorn [SPECIES_RHYHORN] = 1,
1, // Rhydon [SPECIES_RHYDON] = 1,
0, // Chansey [SPECIES_CHANSEY] = 0,
0, // Tangela [SPECIES_TANGELA] = 0,
1, // Kangaskhan [SPECIES_KANGASKHAN] = 1,
0, // Horsea [SPECIES_HORSEA] = 0,
0, // Seadra [SPECIES_SEADRA] = 0,
0, // Goldeen [SPECIES_GOLDEEN] = 0,
0, // Seaking [SPECIES_SEAKING] = 0,
2, // Staryu [SPECIES_STARYU] = 2,
2, // Starmie [SPECIES_STARMIE] = 2,
0, // Mr. mime [SPECIES_MR_MIME] = 0,
1, // Scyther [SPECIES_SCYTHER] = 1,
2, // Jynx [SPECIES_JYNX] = 2,
1, // Electabuzz [SPECIES_ELECTABUZZ] = 1,
0, // Magmar [SPECIES_MAGMAR] = 0,
2, // Pinsir [SPECIES_PINSIR] = 2,
2, // Tauros [SPECIES_TAUROS] = 2,
0, // Magikarp [SPECIES_MAGIKARP] = 0,
0, // Gyarados [SPECIES_GYARADOS] = 0,
2, // Lapras [SPECIES_LAPRAS] = 2,
2, // Ditto [SPECIES_DITTO] = 2,
2, // Eevee [SPECIES_EEVEE] = 2,
0, // Vaporeon [SPECIES_VAPOREON] = 0,
0, // Jolteon [SPECIES_JOLTEON] = 0,
0, // Flareon [SPECIES_FLAREON] = 0,
0, // Porygon [SPECIES_PORYGON] = 0,
0, // Omanyte [SPECIES_OMANYTE] = 0,
0, // Omastar [SPECIES_OMASTAR] = 0,
2, // Kabuto [SPECIES_KABUTO] = 2,
2, // Kabutops [SPECIES_KABUTOPS] = 2,
0, // Aerodactyl [SPECIES_AERODACTYL] = 0,
1, // Snorlax [SPECIES_SNORLAX] = 1,
0, // Articuno [SPECIES_ARTICUNO] = 0,
0, // Zapdos [SPECIES_ZAPDOS] = 0,
0, // Moltres [SPECIES_MOLTRES] = 0,
0, // Dratini [SPECIES_DRATINI] = 0,
0, // Dragonair [SPECIES_DRAGONAIR] = 0,
2, // Dragonite [SPECIES_DRAGONITE] = 2,
2, // Mewtwo [SPECIES_MEWTWO] = 2,
0, // Mew [SPECIES_MEW] = 0,
1, // Chikorita [SPECIES_CHIKORITA] = 1,
1, // Bayleef [SPECIES_BAYLEEF] = 1,
1, // Meganium [SPECIES_MEGANIUM] = 1,
1, // Cyndaquil [SPECIES_CYNDAQUIL] = 1,
1, // Quilava [SPECIES_QUILAVA] = 1,
1, // Typhlosion [SPECIES_TYPHLOSION] = 1,
2, // Totodile [SPECIES_TOTODILE] = 2,
2, // Croconaw [SPECIES_CROCONAW] = 2,
2, // Feraligatr [SPECIES_FERALIGATR] = 2,
2, // Sentret [SPECIES_SENTRET] = 2,
2, // Furret [SPECIES_FURRET] = 2,
2, // Hoothoot [SPECIES_HOOTHOOT] = 2,
2, // Noctowl [SPECIES_NOCTOWL] = 2,
0, // Ledyba [SPECIES_LEDYBA] = 0,
0, // Ledian [SPECIES_LEDIAN] = 0,
1, // Spinarak [SPECIES_SPINARAK] = 1,
0, // Ariados [SPECIES_ARIADOS] = 0,
2, // Crobat [SPECIES_CROBAT] = 2,
2, // Chinchou [SPECIES_CHINCHOU] = 2,
0, // Lanturn [SPECIES_LANTURN] = 0,
0, // Pichu [SPECIES_PICHU] = 0,
0, // Cleffa [SPECIES_CLEFFA] = 0,
1, // Igglybuff [SPECIES_IGGLYBUFF] = 1,
2, // Togepi [SPECIES_TOGEPI] = 2,
2, // Togetic [SPECIES_TOGETIC] = 2,
0, // Natu [SPECIES_NATU] = 0,
0, // Xatu [SPECIES_XATU] = 0,
2, // Mareep [SPECIES_MAREEP] = 2,
0, // Flaaffy [SPECIES_FLAAFFY] = 0,
0, // Ampharos [SPECIES_AMPHAROS] = 0,
1, // Bellossom [SPECIES_BELLOSSOM] = 1,
2, // Marill [SPECIES_MARILL] = 2,
2, // Azumarill [SPECIES_AZUMARILL] = 2,
1, // Sudowoodo [SPECIES_SUDOWOODO] = 1,
1, // Politoed [SPECIES_POLITOED] = 1,
1, // Hoppip [SPECIES_HOPPIP] = 1,
1, // Skiploom [SPECIES_SKIPLOOM] = 1,
2, // Jumpluff [SPECIES_JUMPLUFF] = 2,
2, // Aipom [SPECIES_AIPOM] = 2,
1, // Sunkern [SPECIES_SUNKERN] = 1,
1, // Sunflora [SPECIES_SUNFLORA] = 1,
1, // Yanma [SPECIES_YANMA] = 1,
0, // Wooper [SPECIES_WOOPER] = 0,
0, // Quagsire [SPECIES_QUAGSIRE] = 0,
2, // Espeon [SPECIES_ESPEON] = 2,
2, // Umbreon [SPECIES_UMBREON] = 2,
2, // Murkrow [SPECIES_MURKROW] = 2,
0, // Slowking [SPECIES_SLOWKING] = 0,
0, // Misdreavus [SPECIES_MISDREAVUS] = 0,
0, // Unown A [SPECIES_UNOWN] = 0,
0, // Wobbuffet [SPECIES_WOBBUFFET] = 0,
1, // Girafarig [SPECIES_GIRAFARIG] = 1,
0, // Pineco [SPECIES_PINECO] = 0,
2, // Forretress [SPECIES_FORRETRESS] = 2,
2, // Dunsparce [SPECIES_DUNSPARCE] = 2,
2, // Gligar [SPECIES_GLIGAR] = 2,
0, // Steelix [SPECIES_STEELIX] = 0,
0, // Snubbull [SPECIES_SNUBBULL] = 0,
2, // Granbull [SPECIES_GRANBULL] = 2,
0, // Qwilfish [SPECIES_QWILFISH] = 0,
0, // Scizor [SPECIES_SCIZOR] = 0,
1, // Shuckle [SPECIES_SHUCKLE] = 1,
2, // Heracross [SPECIES_HERACROSS] = 2,
0, // Sneasel [SPECIES_SNEASEL] = 0,
0, // Teddiursa [SPECIES_TEDDIURSA] = 0,
2, // Ursaring [SPECIES_URSARING] = 2,
0, // Slugma [SPECIES_SLUGMA] = 0,
0, // Magcargo [SPECIES_MAGCARGO] = 0,
2, // Swinub [SPECIES_SWINUB] = 2,
2, // Piloswine [SPECIES_PILOSWINE] = 2,
0, // Corsola [SPECIES_CORSOLA] = 0,
0, // Remoraid [SPECIES_REMORAID] = 0,
0, // Octillery [SPECIES_OCTILLERY] = 0,
0, // Delibird [SPECIES_DELIBIRD] = 0,
2, // Mantine [SPECIES_MANTINE] = 2,
0, // Skarmory [SPECIES_SKARMORY] = 0,
0, // Houndour [SPECIES_HOUNDOUR] = 0,
0, // Houndoom [SPECIES_HOUNDOOM] = 0,
0, // Kingdra [SPECIES_KINGDRA] = 0,
0, // Phanpy [SPECIES_PHANPY] = 0,
0, // Donphan [SPECIES_DONPHAN] = 0,
0, // Porygon2 [SPECIES_PORYGON2] = 0,
2, // Stantler [SPECIES_STANTLER] = 2,
1, // Smeargle [SPECIES_SMEARGLE] = 1,
2, // Tyrogue [SPECIES_TYROGUE] = 2,
2, // Hitmontop [SPECIES_HITMONTOP] = 2,
1, // Smoochum [SPECIES_SMOOCHUM] = 1,
1, // Elekid [SPECIES_ELEKID] = 1,
1, // Magby [SPECIES_MAGBY] = 1,
1, // Miltank [SPECIES_MILTANK] = 1,
1, // Blissey [SPECIES_BLISSEY] = 1,
0, // Raikou [SPECIES_RAIKOU] = 0,
2, // Entei [SPECIES_ENTEI] = 2,
0, // Suicune [SPECIES_SUICUNE] = 0,
1, // Larvitar [SPECIES_LARVITAR] = 1,
0, // Pupitar [SPECIES_PUPITAR] = 0,
1, // Tyranitar [SPECIES_TYRANITAR] = 1,
0, // Lugia [SPECIES_LUGIA] = 0,
1, // Ho-Oh [SPECIES_HO_OH] = 1,
1, // Celebi [SPECIES_CELEBI] = 1,
0, // ? [SPECIES_OLD_UNOWN_B] = 0,
0, // ? [SPECIES_OLD_UNOWN_C] = 0,
0, // ? [SPECIES_OLD_UNOWN_D] = 0,
0, // ? [SPECIES_OLD_UNOWN_E] = 0,
0, // ? [SPECIES_OLD_UNOWN_F] = 0,
0, // ? [SPECIES_OLD_UNOWN_G] = 0,
0, // ? [SPECIES_OLD_UNOWN_H] = 0,
0, // ? [SPECIES_OLD_UNOWN_I] = 0,
0, // ? [SPECIES_OLD_UNOWN_J] = 0,
0, // ? [SPECIES_OLD_UNOWN_K] = 0,
0, // ? [SPECIES_OLD_UNOWN_L] = 0,
0, // ? [SPECIES_OLD_UNOWN_M] = 0,
0, // ? [SPECIES_OLD_UNOWN_N] = 0,
0, // ? [SPECIES_OLD_UNOWN_O] = 0,
0, // ? [SPECIES_OLD_UNOWN_P] = 0,
0, // ? [SPECIES_OLD_UNOWN_Q] = 0,
0, // ? [SPECIES_OLD_UNOWN_R] = 0,
0, // ? [SPECIES_OLD_UNOWN_S] = 0,
0, // ? [SPECIES_OLD_UNOWN_T] = 0,
0, // ? [SPECIES_OLD_UNOWN_U] = 0,
0, // ? [SPECIES_OLD_UNOWN_V] = 0,
0, // ? [SPECIES_OLD_UNOWN_W] = 0,
0, // ? [SPECIES_OLD_UNOWN_X] = 0,
0, // ? [SPECIES_OLD_UNOWN_Y] = 0,
0, // ? [SPECIES_OLD_UNOWN_Z] = 0,
1, // Treecko [SPECIES_TREECKO] = 1,
0, // Grovyle [SPECIES_GROVYLE] = 0,
1, // Sceptile [SPECIES_SCEPTILE] = 1,
0, // Torchic [SPECIES_TORCHIC] = 0,
0, // Combusken [SPECIES_COMBUSKEN] = 0,
0, // Blaziken [SPECIES_BLAZIKEN] = 0,
0, // Mudkip [SPECIES_MUDKIP] = 0,
0, // Marshtomp [SPECIES_MARSHTOMP] = 0,
0, // Swampert [SPECIES_SWAMPERT] = 0,
2, // Poochyena [SPECIES_POOCHYENA] = 2,
2, // Mightyena [SPECIES_MIGHTYENA] = 2,
2, // Zigzagoon [SPECIES_ZIGZAGOON] = 2,
2, // Linoone [SPECIES_LINOONE] = 2,
0, // Wurmple [SPECIES_WURMPLE] = 0,
2, // Silcoon [SPECIES_SILCOON] = 2,
0, // Beautifly [SPECIES_BEAUTIFLY] = 0,
2, // Cascoon [SPECIES_CASCOON] = 2,
1, // Dustox [SPECIES_DUSTOX] = 1,
1, // Lotad [SPECIES_LOTAD] = 1,
1, // Lombre [SPECIES_LOMBRE] = 1,
1, // Ludicolo [SPECIES_LUDICOLO] = 1,
1, // Seedot [SPECIES_SEEDOT] = 1,
1, // Nuzleaf [SPECIES_NUZLEAF] = 1,
0, // Shiftry [SPECIES_SHIFTRY] = 0,
1, // Nincada [SPECIES_NINCADA] = 1,
1, // Ninjask [SPECIES_NINJASK] = 1,
1, // Shedinja [SPECIES_SHEDINJA] = 1,
2, // Taillow [SPECIES_TAILLOW] = 2,
2, // Swellow [SPECIES_SWELLOW] = 2,
1, // Shroomish [SPECIES_SHROOMISH] = 1,
1, // Breloom [SPECIES_BRELOOM] = 1,
1, // Spinda [SPECIES_SPINDA] = 1,
0, // Wingull [SPECIES_WINGULL] = 0,
0, // Pelipper [SPECIES_PELIPPER] = 0,
2, // Surskit [SPECIES_SURSKIT] = 2,
0, // Masquerain [SPECIES_MASQUERAIN] = 0,
2, // Wailmer [SPECIES_WAILMER] = 2,
0, // Wailord [SPECIES_WAILORD] = 0,
0, // Skitty [SPECIES_SKITTY] = 0,
2, // Delcatty [SPECIES_DELCATTY] = 2,
1, // Kecleon [SPECIES_KECLEON] = 1,
1, // Baltoy [SPECIES_BALTOY] = 1,
0, // Claydol [SPECIES_CLAYDOL] = 0,
0, // Nosepass [SPECIES_NOSEPASS] = 0,
1, // Torkoal [SPECIES_TORKOAL] = 1,
2, // Sableye [SPECIES_SABLEYE] = 2,
0, // Barboach [SPECIES_BARBOACH] = 0,
0, // Whiscash [SPECIES_WHISCASH] = 0,
0, // Luvdisc [SPECIES_LUVDISC] = 0,
0, // Corphish [SPECIES_CORPHISH] = 0,
0, // Crawdaunt [SPECIES_CRAWDAUNT] = 0,
2, // Feebas [SPECIES_FEEBAS] = 2,
0, // Milotic [SPECIES_MILOTIC] = 0,
0, // Carvanha [SPECIES_CARVANHA] = 0,
0, // Sharpedo [SPECIES_SHARPEDO] = 0,
1, // Trapinch [SPECIES_TRAPINCH] = 1,
1, // Vibrava [SPECIES_VIBRAVA] = 1,
1, // Flygon [SPECIES_FLYGON] = 1,
2, // Makuhita [SPECIES_MAKUHITA] = 2,
1, // Hariyama [SPECIES_HARIYAMA] = 1,
1, // Electrike [SPECIES_ELECTRIKE] = 1,
0, // Manectric [SPECIES_MANECTRIC] = 0,
1, // Numel [SPECIES_NUMEL] = 1,
0, // Camerupt [SPECIES_CAMERUPT] = 0,
2, // Spheal [SPECIES_SPHEAL] = 2,
2, // Sealeo [SPECIES_SEALEO] = 2,
0, // Walrein [SPECIES_WALREIN] = 0,
1, // Cacnea [SPECIES_CACNEA] = 1,
1, // Cacturne [SPECIES_CACTURNE] = 1,
2, // Snorunt [SPECIES_SNORUNT] = 2,
0, // Glalie [SPECIES_GLALIE] = 0,
1, // Lunatone [SPECIES_LUNATONE] = 1,
0, // Solrock [SPECIES_SOLROCK] = 0,
2, // Azurill [SPECIES_AZURILL] = 2,
0, // Spoink [SPECIES_SPOINK] = 0,
2, // Grumpig [SPECIES_GRUMPIG] = 2,
0, // Plusle [SPECIES_PLUSLE] = 0,
0, // Minun [SPECIES_MINUN] = 0,
2, // Mawile [SPECIES_MAWILE] = 2,
0, // Meditite [SPECIES_MEDITITE] = 0,
0, // Medicham [SPECIES_MEDICHAM] = 0,
0, // Swablu [SPECIES_SWABLU] = 0,
0, // Altaria [SPECIES_ALTARIA] = 0,
0, // Wynaut [SPECIES_WYNAUT] = 0,
0, // Duskull [SPECIES_DUSKULL] = 0,
0, // Dusclops [SPECIES_DUSCLOPS] = 0,
0, // Roselia [SPECIES_ROSELIA] = 0,
2, // Slakoth [SPECIES_SLAKOTH] = 2,
2, // Vigoroth [SPECIES_VIGOROTH] = 2,
1, // Slaking [SPECIES_SLAKING] = 1,
1, // Gulpin [SPECIES_GULPIN] = 1,
2, // Swalot [SPECIES_SWALOT] = 2,
1, // Tropius [SPECIES_TROPIUS] = 1,
0, // Whismur [SPECIES_WHISMUR] = 0,
2, // Loudred [SPECIES_LOUDRED] = 2,
2, // Exploud [SPECIES_EXPLOUD] = 2,
0, // Clamperl [SPECIES_CLAMPERL] = 0,
0, // Huntail [SPECIES_HUNTAIL] = 0,
0, // Gorebyss [SPECIES_GOREBYSS] = 0,
0, // Absol [SPECIES_ABSOL] = 0,
0, // Shuppet [SPECIES_SHUPPET] = 0,
0, // Banette [SPECIES_BANETTE] = 0,
2, // Seviper [SPECIES_SEVIPER] = 2,
0, // Zangoose [SPECIES_ZANGOOSE] = 0,
1, // Relicanth [SPECIES_RELICANTH] = 1,
2, // Aron [SPECIES_ARON] = 2,
2, // Lairon [SPECIES_LAIRON] = 2,
2, // Aggron [SPECIES_AGGRON] = 2,
0, // Castform [SPECIES_CASTFORM] = 0,
0, // Volbeat [SPECIES_VOLBEAT] = 0,
2, // Illumise [SPECIES_ILLUMISE] = 2,
2, // Lileep [SPECIES_LILEEP] = 2,
0, // Cradily [SPECIES_CRADILY] = 0,
0, // Anorith [SPECIES_ANORITH] = 0,
0, // Armaldo [SPECIES_ARMALDO] = 0,
1, // Ralts [SPECIES_RALTS] = 1,
1, // Kirlia [SPECIES_KIRLIA] = 1,
1, // Gardevoir [SPECIES_GARDEVOIR] = 1,
2, // Bagon [SPECIES_BAGON] = 2,
2, // Shelgon [SPECIES_SHELGON] = 2,
0, // Salamence [SPECIES_SALAMENCE] = 0,
0, // Beldum [SPECIES_BELDUM] = 0,
0, // Metang [SPECIES_METANG] = 0,
0, // Metagross [SPECIES_METAGROSS] = 0,
2, // Regirock [SPECIES_REGIROCK] = 2,
2, // Regice [SPECIES_REGICE] = 2,
2, // Registeel [SPECIES_REGISTEEL] = 2,
2, // Kyogre [SPECIES_KYOGRE] = 2,
0, // Groudon [SPECIES_GROUDON] = 0,
1, // Rayquaza [SPECIES_RAYQUAZA] = 1,
0, // Latias [SPECIES_LATIAS] = 0,
2, // Latios [SPECIES_LATIOS] = 2,
0, // Jirachi [SPECIES_JIRACHI] = 0,
0, // Deoxys [SPECIES_DEOXYS] = 0,
0, // Chimecho [SPECIES_CHIMECHO] = 0,
1, // Egg [SPECIES_EGG] = 1,
0, // Unown B [SPECIES_UNOWN_B] = 0,
0, // Unown C [SPECIES_UNOWN_C] = 0,
0, // Unown D [SPECIES_UNOWN_D] = 0,
0, // Unown E [SPECIES_UNOWN_E] = 0,
0, // Unown F [SPECIES_UNOWN_F] = 0,
0, // Unown G [SPECIES_UNOWN_G] = 0,
0, // Unown H [SPECIES_UNOWN_H] = 0,
0, // Unown I [SPECIES_UNOWN_I] = 0,
0, // Unown J [SPECIES_UNOWN_J] = 0,
0, // Unown K [SPECIES_UNOWN_K] = 0,
0, // Unown L [SPECIES_UNOWN_L] = 0,
0, // Unown M [SPECIES_UNOWN_M] = 0,
0, // Unown N [SPECIES_UNOWN_N] = 0,
0, // Unown O [SPECIES_UNOWN_O] = 0,
0, // Unown P [SPECIES_UNOWN_P] = 0,
0, // Unown Q [SPECIES_UNOWN_Q] = 0,
0, // Unown R [SPECIES_UNOWN_R] = 0,
0, // Unown S [SPECIES_UNOWN_S] = 0,
0, // Unown T [SPECIES_UNOWN_T] = 0,
0, // Unown U [SPECIES_UNOWN_U] = 0,
0, // Unown V [SPECIES_UNOWN_V] = 0,
0, // Unown W [SPECIES_UNOWN_W] = 0,
0, // Unown X [SPECIES_UNOWN_X] = 0,
0, // Unown Y [SPECIES_UNOWN_Y] = 0,
0, // Unown Z [SPECIES_UNOWN_Z] = 0,
0, // Unown Exclamation Mark [SPECIES_UNOWN_EMARK] = 0,
0, // Unown Question Mark [SPECIES_UNOWN_QMARK] = 0,
}; };
const struct SpritePalette gMonIconPaletteTable[] = const struct SpritePalette gMonIconPaletteTable[] =
@ -1211,7 +1211,7 @@ void sub_80D304C(u16 offset)
if(offset <= 0xA0) if(offset <= 0xA0)
{ {
monIconPalettePtr = gMonIconPaletteTable; monIconPalettePtr = gMonIconPaletteTable;
for(i = 5; i >= 0 ; i--) for(i = 5; i >= 0; i--)
{ {
LoadPalette(monIconPalettePtr->data, offset, 0x20); LoadPalette(monIconPalettePtr->data, offset, 0x20);
offset += 0x10; offset += 0x10;

2
src/pokemon_summary_screen.c
View File

@ -19,7 +19,7 @@
#include "item.h" #include "item.h"
#include "link.h" #include "link.h"
#include "m4a.h" #include "m4a.h"
#include "malloc.h" #include "alloc.h"
#include "menu.h" #include "menu.h"
#include "menu_helpers.h" #include "menu_helpers.h"
#include "mon_markings.h" #include "mon_markings.h"

16
src/rayquaza_scene.c
View File

@ -5,7 +5,7 @@
#include "graphics.h" #include "graphics.h"
#include "bg.h" #include "bg.h"
#include "main.h" #include "main.h"
#include "malloc.h" #include "alloc.h"
#include "palette.h" #include "palette.h"
#include "scanline_effect.h" #include "scanline_effect.h"
#include "menu.h" #include "menu.h"
@ -89,13 +89,13 @@ static void sub_81D9868(struct Sprite *sprite, u8 animNum, s16 x, s16 y);
// const rom data // const rom data
static const TaskFunc sTasksForAnimations[] = static const TaskFunc sTasksForAnimations[] =
{ {
Task_DuoFightAnim, // RAY_ANIM_DUO_FIGHT_PRE [RAY_ANIM_DUO_FIGHT_PRE] = Task_DuoFightAnim,
Task_DuoFightAnim, // RAY_ANIM_DUO_FIGHT [RAY_ANIM_DUO_FIGHT] = Task_DuoFightAnim,
Task_RayTakesFlightAnim, // RAY_ANIM_TAKES_FLIGHT [RAY_ANIM_TAKES_FLIGHT] = Task_RayTakesFlightAnim,
Task_RayDescendsAnim, // RAY_ANIM_DESCENDS [RAY_ANIM_DESCENDS] = Task_RayDescendsAnim,
Task_RayChargesAnim, // RAY_ANIM_CHARGES [RAY_ANIM_CHARGES] = Task_RayChargesAnim,
Task_RayChasesAwayAnim, // RAY_ANIM_CHACES_AWAY [RAY_ANIM_CHACES_AWAY] = Task_RayChasesAwayAnim,
Task_EndAfterFadeScreen // RAY_ANIM_END [RAY_ANIM_END] = Task_EndAfterFadeScreen,
}; };
static const struct OamData sOamData_862A6BC = static const struct OamData sOamData_862A6BC =

2
src/record_mixing.c
View File

@ -1,5 +1,5 @@
#include "global.h" #include "global.h"
#include "malloc.h" #include "alloc.h"
#include "random.h" #include "random.h"
#include "constants/items.h" #include "constants/items.h"
#include "text.h" #include "text.h"

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