decompile trainer see

2017-12-18 23:26:44 +01:00
parent a612ef12a0
commit 5744356989
16 changed files with 517 additions and 1434 deletions
--- a/asm/map_obj_lock.s
+++ b/asm/map_obj_lock.s
@@ -345,7 +345,7 @@ sub_8098630: @ 8098630
 	mov r6, r8
 	push {r6,r7}
 	movs r0, 0
-	bl sub_80B47E0
+	bl GetChosenApproachingTrainerMapObjectId
 	lsls r0, 24
 	lsrs r4, r0, 24
 	ldr r0, =gNoOfApproachingTrainers
@@ -353,7 +353,7 @@ sub_8098630: @ 8098630
 	cmp r0, 0x2
 	bne _080986E0
 	movs r0, 0x1
-	bl sub_80B47E0
+	bl GetChosenApproachingTrainerMapObjectId
 	lsls r0, 24
 	lsrs r0, 24
 	adds r5, r0, 0