Merge pull request #202 from DizzyEggg/move_mon_data

Move data from asm to pokemon_1.c
This commit is contained in:
Diegoisawesome
2018-02-08 14:06:57 -06:00
committed by GitHub
71 changed files with 36869 additions and 26976 deletions
+1 -1
View File
@@ -29847,7 +29847,7 @@ GetTrainerEncounterMusicIdInBattlePyramind: @ 81A9F3C
lsls r0, 16
lsrs r0, 16
movs r4, 0
ldr r3, =gTrainerClassToNameIndex
ldr r3, =gFacilityClassToTrainerClass
ldr r1, =gUnknown_0203BC88
ldr r2, [r1]
movs r1, 0x34